[svn r577] - Bug fix Gmyth-Streamer trunk
authormorphbr
Thu Apr 19 16:02:10 2007 +0100 (2007-04-19)
branchtrunk
changeset 5720bc04f7e67e6
parent 571 f33b61b9d8a5
child 573 f4927ca53da7
[svn r577] - Bug fix Gmyth-Streamer
gmyth-stream/server/0.2/lib/server.py
gmyth-stream/server/0.2/plugins/transcoders/gstreamer.py
gmyth-stream/server/0.2/plugins/transcoders/mencoder.py
     1.1 --- a/gmyth-stream/server/0.2/lib/server.py	Thu Apr 19 15:56:26 2007 +0100
     1.2 +++ b/gmyth-stream/server/0.2/lib/server.py	Thu Apr 19 16:02:10 2007 +0100
     1.3 @@ -335,7 +335,7 @@
     1.4      def serve_stream(self, body):
     1.5          transcoder = self._get_transcoder()
     1.6          try:
     1.7 -            obj = transcoder(self.query, self)
     1.8 +            obj = transcoder(self.query)
     1.9          except Exception, e:
    1.10              self.send_error(500, str(e))
    1.11              return
     2.1 --- a/gmyth-stream/server/0.2/plugins/transcoders/gstreamer.py	Thu Apr 19 15:56:26 2007 +0100
     2.2 +++ b/gmyth-stream/server/0.2/plugins/transcoders/gstreamer.py	Thu Apr 19 16:02:10 2007 +0100
     2.3 @@ -40,14 +40,13 @@
     2.4      # StreamData()
     2.5  
     2.6  
     2.7 -    def __init__(self, params, request):
     2.8 +    def __init__(self, params):
     2.9          server.Transcoder.__init__(self, params)
    2.10          gobject.threads_init ()
    2.11          # set gstreamer basic options
    2.12          self.connection = None
    2.13          self.addr = None
    2.14          self.ready = False
    2.15 -        self.request = request
    2.16  
    2.17          self.log.info("Params for Gstreamer: %s" % self.params)
    2.18      # __init__()
    2.19 @@ -257,7 +256,6 @@
    2.20              self.log.info("Pipe finished")
    2.21              if stream_data.Ready:
    2.22                  self.stop()
    2.23 -                self.request.server.del_transcoders(self.request, self)
    2.24              else:
    2.25                  stream_data.Loop.quit()
    2.26  
    2.27 @@ -266,7 +264,6 @@
    2.28              self.log.error("Error: %s %s" %(err, debug))
    2.29              if stream_data.Ready:
    2.30                  self.stop()
    2.31 -                self.request.server.del_transcoders(self.request, self)
    2.32              else:
    2.33                  stream_data.Loop.quit()
    2.34  
     3.1 --- a/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py	Thu Apr 19 15:56:26 2007 +0100
     3.2 +++ b/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py	Thu Apr 19 16:02:10 2007 +0100
     3.3 @@ -113,7 +113,7 @@
     3.4      # _setup_filename()
     3.5  
     3.6  
     3.7 -    def __init__(self, params, request):
     3.8 +    def __init__(self, params):
     3.9          server.Transcoder.__init__(self, params)
    3.10          self.proc = None
    3.11          self.args = None