fix decoder ratio

diff --git a/tests/alltests.py b/tests/alltests.py
index 454387838e7f36fe23775b3ce7168b0b2bc35f7c..8c76b9bbd5b1ca8dce6b3d297291c35102b3b614 100644 (file)
--- a/tests/alltests.py
+++ b/tests/alltests.py
@@ -3,6 +3,7 @@ from testinputadapter import *
 from testgraphers import *
 from testdecoding import *
 from testtranscoding import *
+from testencoding import *
 from unit_timeside import *
 
 unittest.main(testRunner=TestRunner())

diff --git a/timeside/core.py b/timeside/core.py
index 6bdf6d3b52c62c64ce7189a3978cfbb6040f7c66..b0040dd4a748be7c847cad5d44ff93d7b02c02b8 100644 (file)
--- a/timeside/core.py
+++ b/timeside/core.py
@@ -218,7 +218,6 @@ class ProcessPipe(object):
                        samplerate = last.samplerate(),
                        blocksize = last.blocksize(),
                        totalframes = last.totalframes())
-
             last = item
 
         # now stream audio data along the pipe

diff --git a/timeside/decoder/core.py b/timeside/decoder/core.py
index 49e9cb9ea35e0acefec2fd0866df4d8e2e9e4177..6e52d44ba7dec20b4f3d01cb51015e34b1b45be8 100644 (file)
--- a/timeside/decoder/core.py
+++ b/timeside/decoder/core.py
@@ -238,8 +238,8 @@ class FileDecoder(Processor):
         if self.input_samplerate == self.output_samplerate:
             return self.input_totalframes
         else:
-            ratio = self.output_samplerate / self.input_samplerate
-            return self.input_totalframes * ratio
+            ratio = float(self.output_samplerate) / self.input_samplerate
+            return int(self.input_totalframes * ratio)
 
     @interfacedoc
     def release(self):
@@ -273,9 +273,3 @@ class FileDecoder(Processor):
         # TODO check
         return self.tags
 
-    def duration(self):
-        if self.input_samplerate == self.output_samplerate:
-            return self.input_duration
-        else:
-            ratio = self.input_totalframes / self.output_samplerate
-            return self.input_duration * ratio