From: Thomas Fillon Date: Tue, 16 Sep 2014 18:36:04 +0000 (+0200) Subject: Merge Dev into Diadems X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dc988d78e0a4d2c6188aac4f40760f3ff7832421;p=timeside.git Merge Dev into Diadems --- dc988d78e0a4d2c6188aac4f40760f3ff7832421 diff --cc setup.py index 41143c6,616cbc8..a123e9e --- a/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/irit_noise_startSilences.py index d78153b,7b77400..18cd9a8 --- a/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()