From fdf2eabc83403693a12d76ff35ca09d7ab6421ca Mon Sep 17 00:00:00 2001
From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 14 May 2014 12:35:42 +0200
Subject: [PATCH] Automatic discovering of processors

- Automatic discovering of processors by walking through timeside decoder, analyzer, encoder and grapher subpackages.
- Empty corresponding __init__ files i.e. remove explicit import of processors
---
 timeside/analyzer/__init__.py  | 30 ++++++++----------------------
 timeside/analyzer/limsi_sad.py |  3 ++-
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/timeside/analyzer/__init__.py b/timeside/analyzer/__init__.py
index b49b82a..7da90fd 100644
--- a/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@ -1,41 +1,27 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 
 # ----- Load external libraries ------
 # Aubio
 try:
     WITH_AUBIO = True
-    from aubio_temporal import AubioTemporal
-    from aubio_pitch import AubioPitch
-    from aubio_mfcc import AubioMfcc
-    from aubio_melenergy import AubioMelEnergy
-    from aubio_specdesc import AubioSpecdesc
+    import aubio
 except ImportError:
     WITH_AUBIO = False
-
+else:
+    del aubio
 # Yaafe
 try:
     WITH_YAAFE = True
-    from yaafe import Yaafe
-
+    import yaafelib
 except ImportError:
     WITH_YAAFE = False
-
+else:
+    del yaafelib
 # Vamp Plugins
 try:
-    from vamp_plugin import VampSimpleHost
+    from . vamp_plugin import VampSimpleHost
     VampSimpleHost.SimpleHostProcess(['-v'])
     WITH_VAMP = True
 except OSError:
     WITH_VAMP = False
-
-
-# ----- Load timeside analyzers ------
-from level import Level
-from dc import MeanDCShift
-from spectrogram import Spectrogram
-from waveform import Waveform
-from irit_speech_entropy import IRITSpeechEntropy
-from irit_speech_4hz import IRITSpeech4Hz
-from odf import OnsetDetectionFunction
-if WITH_YAAFE:
-    from limsi_sad import LimsiSad
diff --git a/timeside/analyzer/limsi_sad.py b/timeside/analyzer/limsi_sad.py
index 294d953..9044c52 100644
--- a/timeside/analyzer/limsi_sad.py
+++ b/timeside/analyzer/limsi_sad.py
@@ -23,7 +23,8 @@ from timeside.core import implements, interfacedoc
 from timeside.analyzer.core import Analyzer
 from timeside.api import IAnalyzer
 import timeside
-from timeside.analyzer import WITH_YAAFE
+#from timeside.analyzer import WITH_YAAFE
+WITH_YAAFE = True
 if WITH_YAAFE:
     from yaafe import Yaafe
     import yaafelib
-- 
2.39.5