# HG changeset patch
# User morphbr
# Date 1180360822 -3600
# Node ID 24db164804565a11e9c953aad0365a24005ca735
# Parent  1ee5df4c9ccdefc9b6697e71736e3d97e0897a40
[svn r723] * GMyth-Streamer:
		- Transitional changes to 0.3

diff -r 1ee5df4c9ccd -r 24db16480456 gmyth-stream/server/0.2/lib/server.py
--- a/gmyth-stream/server/0.2/lib/server.py	Fri May 25 19:46:59 2007 +0100
+++ b/gmyth-stream/server/0.2/lib/server.py	Mon May 28 15:00:22 2007 +0100
@@ -23,6 +23,7 @@
     priority = 0   # negative values have higher priorities
     name = None # to be used in requests
     status = None
+    tid = -1
 
     def __init__(self, params):
         self.params = params
@@ -58,7 +59,7 @@
 
 
     def stop(self):
-        return Tru
+        return True
     # stop()
 
 
diff -r 1ee5df4c9ccd -r 24db16480456 gmyth-stream/server/0.2/plugins/transcoders/mencoder.py
--- a/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py	Fri May 25 19:46:59 2007 +0100
+++ b/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py	Mon May 28 15:00:22 2007 +0100
@@ -252,7 +252,8 @@
 
         ret = False
 
-        if self.args["outfile"] == "-" and self.args["type"] in ["file", "dvd"]:
+        if self.args["outfile"] == "-" and \
+               self.args["type"] in ["file", "dvd"]:
             ret = self._start(outfd)
 
         elif self.args["type"] == "myth":
@@ -262,6 +263,10 @@
             ret = self._start_outfile(outfd)
 
         self.stop()
+
+        if not ret:
+            self.log.error("Problems while starting streaming.")
+
         return ret
     # start()
 
diff -r 1ee5df4c9ccd -r 24db16480456 gmyth-stream/server/0.2/plugins/transcoders/mencoder_lib/mythtv.py
--- a/gmyth-stream/server/0.2/plugins/transcoders/mencoder_lib/mythtv.py	Fri May 25 19:46:59 2007 +0100
+++ b/gmyth-stream/server/0.2/plugins/transcoders/mencoder_lib/mythtv.py	Mon May 28 15:00:22 2007 +0100
@@ -46,12 +46,16 @@
 
 def _setup_gmythcat(self):
     gmyth_cat = utils.which("gmyth-cat")
-    return [ utils.which("gmyth-cat"),
-            "-h", self.args["gmyth-cat"]["backend"],
-            "-p", self.args["gmyth-cat"]["port"],
-            "-" + self.args["gmyth-cat"]["kind"],
-            self.args["gmyth-cat"]["cfile"]
-           ]
+    if self.args.has_key("gmyth-cat"):
+        return [ utils.which("gmyth-cat"),
+                 "-h", self.args["gmyth-cat"]["backend"],
+                 "-p", self.args["gmyth-cat"]["port"],
+                 "-" + self.args["gmyth-cat"]["kind"],
+                 self.args["gmyth-cat"]["cfile"]
+                 ]
+    else:
+        self.log.error("URI error")
+        return []
 # _setup_gmythcat
 
 def start_myth(self, outfd):