timeside/analyzer/: enable aubio, beautify titles

diff --git a/timeside/analyzer/__init__.py b/timeside/analyzer/__init__.py
index 5baf44ac53fa5dd0da0adf227ec29bdc79da6c53..7ecbc12109d048ee18e782cc51fa38ea54b5e2b1 100644 (file)
--- a/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@ -3,7 +3,7 @@
 from max_level import *
 from mean_level import *
 from dc import *
-#from aubio_bpm import *
-#from aubio_onsetrate import *
-
-
+from aubio_bpm import *
+from aubio_onsetrate import *
+from aubio_onset import *
+from aubio_pitch import *

diff --git a/timeside/analyzer/aubio_bpm.py b/timeside/analyzer/aubio_bpm.py
index 226a9e6bcfa07e0339a4429aa0092facecfb50f4..096a0538de514e898e4d2de03772778982b3af26 100644 (file)
--- a/timeside/analyzer/aubio_bpm.py
+++ b/timeside/analyzer/aubio_bpm.py
@@ -45,7 +45,7 @@ class AubioBPM(Processor):
     @staticmethod
     @interfacedoc
     def name():
-        return "aubio bpm"
+        return "bpm (aubio)"
 
     @staticmethod
     @interfacedoc

diff --git a/timeside/analyzer/aubio_onset.py b/timeside/analyzer/aubio_onset.py
index dc0cf846ac8d2a70db2531639d594aa2c787f6b9..a754322e16f2c198229966d118822fcd27a709ee 100644 (file)
--- a/timeside/analyzer/aubio_onset.py
+++ b/timeside/analyzer/aubio_onset.py
@@ -44,7 +44,7 @@ class AubioOnset(Processor):
     @staticmethod
     @interfacedoc
     def name():
-        return "aubio onset rate"
+        return "onsets (aubio)"
 
     @staticmethod
     @interfacedoc

diff --git a/timeside/analyzer/aubio_onsetrate.py b/timeside/analyzer/aubio_onsetrate.py
index 9aba7aba6ac1567bdeff68872601cd9c181c06a4..5846ba92a94d8f7cd98a6de2ac843d0fb2f2803f 100644 (file)
--- a/timeside/analyzer/aubio_onsetrate.py
+++ b/timeside/analyzer/aubio_onsetrate.py
@@ -44,7 +44,7 @@ class AubioOnsetRate(Processor):
     @staticmethod
     @interfacedoc
     def name():
-        return "aubio onset rate"
+        return "onset rate (aubio)"
 
     @staticmethod
     @interfacedoc

diff --git a/timeside/analyzer/aubio_pitch.py b/timeside/analyzer/aubio_pitch.py
index 074622ab93ed087da9ae44d301785d943f911100..f06da9b802fba24bcf4b37b7cdeb312fb4e26551 100644 (file)
--- a/timeside/analyzer/aubio_pitch.py
+++ b/timeside/analyzer/aubio_pitch.py
@@ -45,7 +45,7 @@ class AubioPitch(Processor):
     @staticmethod
     @interfacedoc
     def name():
-        return "aubio pitch"
+        return "f0 (aubio)"
 
     @staticmethod
     @interfacedoc
@@ -59,7 +59,8 @@ class AubioPitch(Processor):
         i = 0
         while i < frames.shape[0]:
             downmixed = frames[i:i+self.hop_s, :].sum(axis = -1)
-            self.pitches += [self.p(downmixed)[0]]
+            time = self.block_read * self.hop_s * 1. / self.samplerate()
+            self.pitches += [[time, self.p(downmixed)[0]]]
             i += self.hop_s
             self.block_read += 1
         return frames, eod