# HG changeset patch
# User morphbr
# Date 1180708571 -3600
# Node ID 517706c7003effd070c9fbf705dfbb7ca5ec0026
# Parent  293e6c9546e5ad4d726b0b23965056f1cefa9b69
[svn r745] one more test for tv 2

diff -r 293e6c9546e5 -r 517706c7003e gmyth-stream/server/0.3/plugins/transcoders/mencoder.py
--- a/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py	Fri Jun 01 15:24:34 2007 +0100
+++ b/gmyth-stream/server/0.3/plugins/transcoders/mencoder.py	Fri Jun 01 15:36:11 2007 +0100
@@ -102,7 +102,9 @@
     def _setup_mencoder_opts(self, args):
         args.append(self.mencoder_path)
 
-        if self.args["outfile"] == "-" and self.args["type"]:
+        if self.args["type"] and self.args["type"] == "tv":
+            self._arg_append(args, self.args["tv"])
+        elif self.args["outfile"] == "-" and self.args["type"]:
             args.append(self.args["input"])
         else:
             args.append("-")
@@ -162,14 +164,13 @@
             outfmt = self.params_first("outfmt", "yuy2")
             vdev = self.params_first("vdev", "/dev/video0")
             adev = self.params_first("adev", "/dev/dsp")
-            tv = "tv:// -v -tv driver=%s:norm=%s:channel=%s:" \
-                 "chanlist=%s:width=%s:height=%s:outfmt=%s:" \
-                 "device=%s:adevice=%s" % (driver, norm,
-                                           channel, chanlist,
-                                           self.args["width"],
-                                           self.args["height"],
-                                           outfmt, vdev, adev)
-            self.args["input"] = tv.split(" ")
+            self.args["tv"] = "tv:// -v -tv driver=%s:norm=%s:channel=%s:" \
+                              "chanlist=%s:width=%s:height=%s:outfmt=%s:" \
+                              "device=%s:adevice=%s" % (driver, norm,
+                                                        channel, chanlist,
+                                                        self.args["width"],
+                                                        self.args["height"],
+                                                        outfmt, vdev, adev)
     # _setup_filename()
 
 
@@ -278,6 +279,7 @@
     # _run_mencoder()
 
     def start(self, outfd):
+        print "mencoder_opts: %s" % self.mencoder_opts
         cmd = " ".join(self.mencoder_opts)
         self.log.debug(self.tid, "Plugin's tid: %s" % self.tid)
         self.log.debug(self.tid, "Mencoder: %s" % cmd)