# HG changeset patch
# User morphbr
# Date 1176821320 -3600
# Node ID 4a18d3961be94b736294ef41ea66d4a85af5050a
# Parent  994917e6cadf3674ff41217ac58140efb91c1e44
[svn r565] - Bug fixes in gmyth-streamer (0.1)

diff -r 994917e6cadf -r 4a18d3961be9 gmyth-stream/server/plugins/media/mencoder.py
--- a/gmyth-stream/server/plugins/media/mencoder.py	Tue Apr 17 15:37:20 2007 +0100
+++ b/gmyth-stream/server/plugins/media/mencoder.py	Tue Apr 17 15:48:40 2007 +0100
@@ -302,7 +302,6 @@
                     retry += 1
 
                 data = self.pout.read(4096)
-                print data
 
         else:
             local = open(self.transcode_local, "w")
@@ -329,25 +328,25 @@
 
     def play(self):
 
-        log.info("Starting Mencoder: %s" % self.args )
-
         if self.gst_pipe:
             try:
-                gst = [ lib.which("gst-launch-0.10") ]
-                self.arg_append(gst, "gnomevfssrc location=%s" % self.filename)
-                self.arg_append(gst, "! fdsink fd=%d" % self.gst_pipe[1])
-                self.gst_pid = Popen(gst, stdout=self.gst_pipe[1], close_fds=True)
+                gst = [ lib.which("gst-launch-0.10"), "--gst-debug-level=0" ]
+                self.arg_append(gst, "mythtvsrc location=%s" % self.filename)
+                self.arg_append(gst, "! fdsink fd=2")
+                self.gst_pid = Popen(gst, close_fds=True)
                 log.info("Running Gstreamer: %s" % gst);
             except Exception, e:
                 msg = "Could not init Gstreamer: %s" % e
                 log.error(msg)
                 return (False, msg)
 
+
+        log.info("Starting Mencoder: %s" % self.args )
         try:
             if not self.gst_pipe:
                 self.stdin = open(self.filename)
             else:
-                self.stdin = self.gst_pipe[0]
+                self.stdin = self.gst_pid.stdout
 
             self.mencoder_pid = Popen(self.args, stdin=self.stdin, stdout=PIPE, close_fds=True)
         except Exception, e:
diff -r 994917e6cadf -r 4a18d3961be9 gmyth-stream/server/stream.conf
--- a/gmyth-stream/server/stream.conf	Tue Apr 17 15:37:20 2007 +0100
+++ b/gmyth-stream/server/stream.conf	Tue Apr 17 15:48:40 2007 +0100
@@ -4,7 +4,7 @@
 
 
 [Media]
-engine = gstreamer
+engine = mencoder
 
 
 [Vlc]