[svn r565] - Bug fixes in gmyth-streamer (0.1) trunk
authormorphbr
Tue Apr 17 15:48:40 2007 +0100 (2007-04-17)
branchtrunk
changeset 5604a18d3961be9
parent 559 994917e6cadf
child 561 c4169fee6878
[svn r565] - Bug fixes in gmyth-streamer (0.1)
gmyth-stream/server/plugins/media/mencoder.py
gmyth-stream/server/stream.conf
     1.1 --- a/gmyth-stream/server/plugins/media/mencoder.py	Tue Apr 17 15:37:20 2007 +0100
     1.2 +++ b/gmyth-stream/server/plugins/media/mencoder.py	Tue Apr 17 15:48:40 2007 +0100
     1.3 @@ -302,7 +302,6 @@
     1.4                      retry += 1
     1.5  
     1.6                  data = self.pout.read(4096)
     1.7 -                print data
     1.8  
     1.9          else:
    1.10              local = open(self.transcode_local, "w")
    1.11 @@ -329,25 +328,25 @@
    1.12  
    1.13      def play(self):
    1.14  
    1.15 -        log.info("Starting Mencoder: %s" % self.args )
    1.16 -
    1.17          if self.gst_pipe:
    1.18              try:
    1.19 -                gst = [ lib.which("gst-launch-0.10") ]
    1.20 -                self.arg_append(gst, "gnomevfssrc location=%s" % self.filename)
    1.21 -                self.arg_append(gst, "! fdsink fd=%d" % self.gst_pipe[1])
    1.22 -                self.gst_pid = Popen(gst, stdout=self.gst_pipe[1], close_fds=True)
    1.23 +                gst = [ lib.which("gst-launch-0.10"), "--gst-debug-level=0" ]
    1.24 +                self.arg_append(gst, "mythtvsrc location=%s" % self.filename)
    1.25 +                self.arg_append(gst, "! fdsink fd=2")
    1.26 +                self.gst_pid = Popen(gst, close_fds=True)
    1.27                  log.info("Running Gstreamer: %s" % gst);
    1.28              except Exception, e:
    1.29                  msg = "Could not init Gstreamer: %s" % e
    1.30                  log.error(msg)
    1.31                  return (False, msg)
    1.32  
    1.33 +
    1.34 +        log.info("Starting Mencoder: %s" % self.args )
    1.35          try:
    1.36              if not self.gst_pipe:
    1.37                  self.stdin = open(self.filename)
    1.38              else:
    1.39 -                self.stdin = self.gst_pipe[0]
    1.40 +                self.stdin = self.gst_pid.stdout
    1.41  
    1.42              self.mencoder_pid = Popen(self.args, stdin=self.stdin, stdout=PIPE, close_fds=True)
    1.43          except Exception, e:
     2.1 --- a/gmyth-stream/server/stream.conf	Tue Apr 17 15:37:20 2007 +0100
     2.2 +++ b/gmyth-stream/server/stream.conf	Tue Apr 17 15:48:40 2007 +0100
     2.3 @@ -4,7 +4,7 @@
     2.4  
     2.5  
     2.6  [Media]
     2.7 -engine = gstreamer
     2.8 +engine = mencoder
     2.9  
    2.10  
    2.11  [Vlc]