# HG changeset patch
# User morphbr
# Date 1176994930 -3600
# Node ID 0bc04f7e67e6b273f33af888c30e181f1167da1f
# Parent  f33b61b9d8a59c1c190e0d6ec00da1446dc7e050
[svn r577] - Bug fix Gmyth-Streamer

diff -r f33b61b9d8a5 -r 0bc04f7e67e6 gmyth-stream/server/0.2/lib/server.py
--- a/gmyth-stream/server/0.2/lib/server.py	Thu Apr 19 15:56:26 2007 +0100
+++ b/gmyth-stream/server/0.2/lib/server.py	Thu Apr 19 16:02:10 2007 +0100
@@ -335,7 +335,7 @@
     def serve_stream(self, body):
         transcoder = self._get_transcoder()
         try:
-            obj = transcoder(self.query, self)
+            obj = transcoder(self.query)
         except Exception, e:
             self.send_error(500, str(e))
             return
diff -r f33b61b9d8a5 -r 0bc04f7e67e6 gmyth-stream/server/0.2/plugins/transcoders/gstreamer.py
--- a/gmyth-stream/server/0.2/plugins/transcoders/gstreamer.py	Thu Apr 19 15:56:26 2007 +0100
+++ b/gmyth-stream/server/0.2/plugins/transcoders/gstreamer.py	Thu Apr 19 16:02:10 2007 +0100
@@ -40,14 +40,13 @@
     # StreamData()
 
 
-    def __init__(self, params, request):
+    def __init__(self, params):
         server.Transcoder.__init__(self, params)
         gobject.threads_init ()
         # set gstreamer basic options
         self.connection = None
         self.addr = None
         self.ready = False
-        self.request = request
 
         self.log.info("Params for Gstreamer: %s" % self.params)
     # __init__()
@@ -257,7 +256,6 @@
             self.log.info("Pipe finished")
             if stream_data.Ready:
                 self.stop()
-                self.request.server.del_transcoders(self.request, self)
             else:
                 stream_data.Loop.quit()
 
@@ -266,7 +264,6 @@
             self.log.error("Error: %s %s" %(err, debug))
             if stream_data.Ready:
                 self.stop()
-                self.request.server.del_transcoders(self.request, self)
             else:
                 stream_data.Loop.quit()
 
diff -r f33b61b9d8a5 -r 0bc04f7e67e6 gmyth-stream/server/0.2/plugins/transcoders/mencoder.py
--- a/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py	Thu Apr 19 15:56:26 2007 +0100
+++ b/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py	Thu Apr 19 16:02:10 2007 +0100
@@ -113,7 +113,7 @@
     # _setup_filename()
 
 
-    def __init__(self, params, request):
+    def __init__(self, params):
         server.Transcoder.__init__(self, params)
         self.proc = None
         self.args = None