1.1 --- a/gmyth-stream/server/0.2/lib/server.py Fri May 25 19:46:59 2007 +0100
1.2 +++ b/gmyth-stream/server/0.2/lib/server.py Mon May 28 15:00:22 2007 +0100
1.3 @@ -23,6 +23,7 @@
1.4 priority = 0 # negative values have higher priorities
1.5 name = None # to be used in requests
1.6 status = None
1.7 + tid = -1
1.8
1.9 def __init__(self, params):
1.10 self.params = params
1.11 @@ -58,7 +59,7 @@
1.12
1.13
1.14 def stop(self):
1.15 - return Tru
1.16 + return True
1.17 # stop()
1.18
1.19
2.1 --- a/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py Fri May 25 19:46:59 2007 +0100
2.2 +++ b/gmyth-stream/server/0.2/plugins/transcoders/mencoder.py Mon May 28 15:00:22 2007 +0100
2.3 @@ -252,7 +252,8 @@
2.4
2.5 ret = False
2.6
2.7 - if self.args["outfile"] == "-" and self.args["type"] in ["file", "dvd"]:
2.8 + if self.args["outfile"] == "-" and \
2.9 + self.args["type"] in ["file", "dvd"]:
2.10 ret = self._start(outfd)
2.11
2.12 elif self.args["type"] == "myth":
2.13 @@ -262,6 +263,10 @@
2.14 ret = self._start_outfile(outfd)
2.15
2.16 self.stop()
2.17 +
2.18 + if not ret:
2.19 + self.log.error("Problems while starting streaming.")
2.20 +
2.21 return ret
2.22 # start()
2.23
3.1 --- a/gmyth-stream/server/0.2/plugins/transcoders/mencoder_lib/mythtv.py Fri May 25 19:46:59 2007 +0100
3.2 +++ b/gmyth-stream/server/0.2/plugins/transcoders/mencoder_lib/mythtv.py Mon May 28 15:00:22 2007 +0100
3.3 @@ -46,12 +46,16 @@
3.4
3.5 def _setup_gmythcat(self):
3.6 gmyth_cat = utils.which("gmyth-cat")
3.7 - return [ utils.which("gmyth-cat"),
3.8 - "-h", self.args["gmyth-cat"]["backend"],
3.9 - "-p", self.args["gmyth-cat"]["port"],
3.10 - "-" + self.args["gmyth-cat"]["kind"],
3.11 - self.args["gmyth-cat"]["cfile"]
3.12 - ]
3.13 + if self.args.has_key("gmyth-cat"):
3.14 + return [ utils.which("gmyth-cat"),
3.15 + "-h", self.args["gmyth-cat"]["backend"],
3.16 + "-p", self.args["gmyth-cat"]["port"],
3.17 + "-" + self.args["gmyth-cat"]["kind"],
3.18 + self.args["gmyth-cat"]["cfile"]
3.19 + ]
3.20 + else:
3.21 + self.log.error("URI error")
3.22 + return []
3.23 # _setup_gmythcat
3.24
3.25 def start_myth(self, outfd):