Merge Dev into Diadems

diff --cc setup.py
index 41143c6b2682b879ceaad7c306e7fe7d254aa0b4,616cbc8a3757471396b6e81eee54fb02820f7ae4..a123e9e305f2e9a949cb38cd14aaab391d0396d1
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -59,12 -59,9 +59,13 @@@ setup
          'django-extensions',
          'djangorestframework',
          'south',
 -        'traits',
 +        'py_sonicvisualiser',
 +        'pyannote.core',
 +        'pyannote.features',
 +        'traits'
+         'networkx'
          ],
 +
    platforms=['OS Independent'],
    license='Gnu Public License V2',
    classifiers = CLASSIFIERS,

diff --cc timeside/analyzer/aubio/aubio_melenergy.py
Simple merge

diff --cc timeside/analyzer/core.py
Simple merge

diff --cc timeside/analyzer/irit_noise_startSilences.py
index d78153b87a00072a536644f33c376f1ee35f97ba,7b77400e1e108f30a41d7890d3ea94a175eafdba..18cd9a80553423b54d006ad394ee237f33c48298
--- 1/timeside/analyzer/irit_noise_startSilences.py
--- 2/timeside/analyzer/irit_noise_startSilences.py
+++ b/timeside/analyzer/irit_noise_startSilences.py
@@@ -186,7 -186,7 +186,8 @@@ class IRITStartSeg(Analyzer)
                                   for s in selected_segs]
          segs.data_object.duration = [(float(s[1] - s[0]) * step)
                                       for s in selected_segs]
-         self.process_pipe.results.add(segs)
++
+         self.add_result(segs)
  
      def release(self):
          self._buffer.close()

diff --cc timeside/analyzer/irit_speech_4hz.py
Simple merge