fix streamer

diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index dc24a4fca6a666823f012de5542efe42c1597c73..d57490eacd01141167d46858800dc4c8bfaddc85 100644 (file)
--- a/telemeta/views/core.py
+++ b/telemeta/views/core.py
@@ -106,16 +106,15 @@ def render(request, template, data = None, mimetype = None):
     return render_to_response(template, data, context_instance=RequestContext(request),
                               mimetype=mimetype)
 
-def stream_from_processor(__decoder, __processor, __flag, metadata=None):
+def stream_from_processor(_decoder, _proc, _flag, metadata=None):
     if metadata:
-        __processor.set_metadata(metadata)
-    while True:
-        __frames, __eodproc = __processor.process(*__decoder.process())
-        if __eodproc or not len(__frames):
-            __flag.value = True
-            __flag.save()
-            break
-        yield __processor.chunk
+        _proc.set_metadata(metadata)
+    _eod = False
+    while not _eod:
+        _frames, _eod = _proc.process(*_decoder.process())
+        yield _proc.chunk
+    _flag.value = True
+    _flag.save()
 
 def stream_from_file(__file):
     chunk_size = 0x100000

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 03c3cb55dc9e5c1651621b23ff0d712834e3654e..b64eb6e20b0bdf54040f67f0556337edf9e85af7 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -538,8 +538,7 @@ class ItemView(object):
                 decoder = timeside.decoder.FileDecoder(audio)
                 decoder.setup()
                 proc = encoder(media, streaming=True)
-                proc.setup(channels=decoder.channels(), samplerate=decoder.samplerate(),
-                           nframes=decoder.nframes())
+                proc.setup(channels=decoder.channels(), samplerate=decoder.samplerate())
                 if extension in mapping.unavailable_extensions:
                     metadata=None
                 response = HttpResponse(stream_from_processor(decoder, proc, flag, metadata=metadata), mimetype = mime_type)