From 8135e000ee265b88102931e8a8b39b71ea611899 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Sat, 13 Apr 2013 18:01:28 -0500
Subject: [PATCH] timeside/analyzer/: enable aubio, beautify titles

---
 timeside/analyzer/__init__.py        | 8 ++++----
 timeside/analyzer/aubio_bpm.py       | 2 +-
 timeside/analyzer/aubio_onset.py     | 2 +-
 timeside/analyzer/aubio_onsetrate.py | 2 +-
 timeside/analyzer/aubio_pitch.py     | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/timeside/analyzer/__init__.py b/timeside/analyzer/__init__.py
index 5baf44a..7ecbc12 100644
--- 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 226a9e6..096a053 100644
--- 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 dc0cf84..a754322 100644
--- 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 9aba7ab..5846ba9 100644
--- 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 074622a..f06da9b 100644
--- 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
-- 
2.39.5