From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 3 Oct 2014 13:26:19 +0000 (+0200)
Subject: fix(limsi_sad): fix the last fix again
X-Git-Tag: 0.6~4^2~26
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=406e20303c491471c2356fe5a087d0c27b3b2a4c;p=timeside.git

fix(limsi_sad): fix the last fix again
---

diff --git a/timeside/analyzer/limsi_sad.py b/timeside/analyzer/limsi_sad.py
index cfc1612..1311f44 100644
--- a/timeside/analyzer/limsi_sad.py
+++ b/timeside/analyzer/limsi_sad.py
@@ -30,6 +30,10 @@ import numpy as np
 import pickle
 import os.path
 
+# Require Yaafe
+if not timeside._WITH_YAAFE:
+    raise ImportError('yaafelib must be missing')
+
 
 class GMM:
     """
@@ -149,11 +153,7 @@ class LimsiSad(Analyzer):
                         'mfccd1: MFCC CepsIgnoreFirstCoeff=0 blockSize=1024 stepSize=256 > Derivate DOrder=1',
                         'mfccd2: MFCC CepsIgnoreFirstCoeff=0 blockSize=1024 stepSize=256 > Derivate DOrder=2',
                         'zcr: ZCR blockSize=1024 stepSize=256']
-        try:
-            yaafe_analyzer = get_processor('yaafe')
-        except timeside.exceptions.PIDError as e:
-            raise ImportError(e.message + '.yaafelib must be missing')
-
+        yaafe_analyzer = get_processor('yaafe')
         self.parents['yaafe'] = yaafe_analyzer(feature_plan=feature_plan,
                                                input_samplerate=16000)