fix api doc and adaprter property

diff --git a/timeside/api.py b/timeside/api.py
index f3fb08f7d6c6077d319afd7a3d32df34a3c77e50..ab877e28734963a9de4c5cbcc437bac68e2f7270 100644 (file)
--- a/timeside/api.py
+++ b/timeside/api.py
@@ -55,11 +55,11 @@ class IProcessor(Interface):
 
     def blocksize():
         """The total number of frames that this processor can output for each step
-        in the pipeline, or None if the duration is unknown."""
+        in the pipeline, or None if the number is unknown."""
 
     def totalframes():
-        """The total number of frames that this processor can output, or None if
-        the duration is unknown."""
+        """The total number of frames that this processor will output, or None if
+        the number is unknown."""
 
     def process(self, frames=None, eod=False):
         """Process input frames and return a (output_frames, eod) tuple.

diff --git a/timeside/core.py b/timeside/core.py
index f87dc34153a8dfa56b3d2e2ade2f5bd8fe74073f..8fecc21b00c00d5070d7854c89399a96c423c808 100644 (file)
--- a/timeside/core.py
+++ b/timeside/core.py
@@ -123,18 +123,11 @@ class FixedSizeInputAdapter(object):
 
         return blocksize
 
-
     def totalframes(self, input_totalframes):
         """Return the total number of frames that this adapter will output according to the
         input_blocksize argument"""
 
-        totalframes = input_totalframes
-        if self.pad:
-            mod = input_totalframes % self.buffer_size
-            if mod:
-                totalframes += self.buffer_size - mod
-
-        return totalframes
+        return input_totalframes
 
     def process(self, frames, eod):
         """Returns an iterator over tuples of the form (buffer, eod) where buffer is a