From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 15 May 2014 12:40:27 +0000 (+0200)
Subject: Merge dev into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f6becec525caff65c91c20dbd0d3582be4de10ef;p=timeside.git

Merge dev into diadems
---

f6becec525caff65c91c20dbd0d3582be4de10ef
diff --cc timeside/analyzer/irit_speech_entropy.py
index 1d91cbe,febf1a4..1de8d77
--- a/timeside/analyzer/irit_speech_entropy.py
+++ b/timeside/analyzer/irit_speech_entropy.py
@@@ -110,11 -98,10 +111,11 @@@ class IRITSpeechEntropy(Analyzer)
          segs.label_metadata.label = label
  
          segs.data_object.label = [convert[s[2]] for s in segList]
 -        segs.data_object.time = [(float(s[0]) * self.blocksize() /
 +        segs.data_object.time = [(float(s[0]) * self.input_blocksize /
                                   self.samplerate())
                                   for s in segList]
 +
-         segs.data_object.duration = [(float(s[1]-s[0]+1) * self.blocksize() /
+         segs.data_object.duration = [(float(s[1] - s[0] + 1) * self.blocksize() /
                                       self.samplerate())
                                       for s in segList]