fix empty argument for AnalyzerResultContainer, fix aubio_specdesc.results, add resul...

diff --git a/setup.py b/setup.py
index 2b207c21c22edc8823a1dc6fcc3eecdf2f58f018..d5dae272d79add9ccca1ee4d1136c247cbf06bd8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@ setup(
         'numpy>=1.6.2',
         'mutagen',
         'pil',
+        'scipy',
         ],
   platforms=['OS Independent'],
   license='Gnu Public License V2',

diff --git a/timeside/analyzer/aubio_specdesc.py b/timeside/analyzer/aubio_specdesc.py
index b9a1c10d9c0cccaffe5fec3e46503880649883ad..6c52031d5deb5e42af175246f44f26ab104ef783 100644 (file)
--- a/timeside/analyzer/aubio_specdesc.py
+++ b/timeside/analyzer/aubio_specdesc.py
@@ -88,4 +88,4 @@ class AubioSpecdesc(Processor):
 
             container.add_result([specdesc, specdesc_mean, specdesc_median])
 
-        return AnalyzerResultContainer()
+        return container

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 1f2f0fe404c6bce79911b78ee994f6c74d482329..b1553b14786f20c948ffd47073b957852345f426 100644 (file)
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -79,7 +79,9 @@ class AnalyzerResult(dict):
 
 class AnalyzerResultContainer(object):
 
-    def __init__(self, analyzer_results = []):
+    def __init__(self, analyzer_results=None):
+        if analyzer_results is None:
+            analyzer_results = []
         self.results = analyzer_results
 
     def __getitem__(self, i):

diff --git a/timeside/api.py b/timeside/api.py
index 6185286764690aa52bd295eaf4fce2a3523e5d6a..116cc74fb1e3e6f2d3786fbe1389c22487da58d7 100644 (file)
--- a/timeside/api.py
+++ b/timeside/api.py
@@ -207,6 +207,10 @@ class IValueAnalyzer(IAnalyzer):
         """Return the final result of the analysis performed over the data passed by
         repeatedly calling process()"""
 
+    def results():
+        """Return the final results of the analysis performed over the data passed by
+        repeatedly calling process()"""
+
     def __str__(self):
         """Return a human readable string containing both result and unit
         ('5.30dB', '4.2s', etc...)"""