From e40da16f45819c01d526cf6c83356ddee3bf8164 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 3 Mar 2011 19:20:42 +0100
Subject: [PATCH] bugfixes on streaming processors

---
 telemeta/htdocs/css/telemeta.css |  2 +-
 telemeta/web/base.py             | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index f81db508..49277b68 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -137,7 +137,7 @@ a img { border: none; }
     padding: 2px;
     height: 26px;
     margin: 5px 0 0;
-    font-size: 1em;
+    font-size: 0.9em;
     color: #000;
     font-weight: bold;
 }
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index dec536d7..fd36be4e 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -76,8 +76,6 @@ def stream_from_processor(decoder, processor):
         frames, eod = decoder.process()
         _chunk, eodproc = processor.process(frames, eod)
         if eodproc:
-            decoder.release()
-            processor.release()
             break
         yield _chunk
 
@@ -168,8 +166,7 @@ class WebView(object):
         # Get TimeSide processors
         formats = []
         for encoder in self.encoders:
-            if 'stream' in encoder.id():
-                formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
+            formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
 
         graphers = []
         for grapher in self.graphers:
@@ -195,8 +192,7 @@ class WebView(object):
         
         formats = []
         for encoder in self.encoders:
-            if 'stream' in encoder.id():
-                formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
+            formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
 
         graphers = []
         for grapher in self.graphers:
@@ -316,7 +312,7 @@ class WebView(object):
             raise Http404 # FIXME: should be some sort of permissions denied error
 
         for encoder in self.encoders:
-            if encoder.file_extension() == extension and 'stream' in encoder.id():
+            if encoder.file_extension() == extension:
                 break
 
         if encoder.file_extension() != extension:
@@ -337,7 +333,7 @@ class WebView(object):
                 # source > encoder > stream
                 decoder.setup()
                 media = self.cache_export.dir + os.sep + file
-                proc = encoder(media)
+                proc = encoder(media, streaming=True)
                 proc.setup(channels=decoder.channels(), samplerate=decoder.samplerate(), nframes=decoder.nframes())
 #                metadata = dublincore.express_item(item).to_list()
 #                enc.set_metadata(metadata)
-- 
2.39.5