diff -r 27e83a8f68d7 -r c4169fee6878 gmyth-stream/server/plugins/comm/xmlrpc.py --- a/gmyth-stream/server/plugins/comm/xmlrpc.py Tue Apr 03 16:42:04 2007 +0100 +++ b/gmyth-stream/server/plugins/comm/xmlrpc.py Tue Apr 17 21:13:22 2007 +0100 @@ -15,7 +15,8 @@ def _methodHelp(self, method): if method == 'setup': - return "Setup the Media: setup( filename, mux, vcodec, vbitrate, fps, acodec, abitrate, width, height, port" + return "Setup the Media: setup( filename, mux, vcodec, vbitrate,"\ + " fps, acodec, abitrate, width, height, port, options" elif method == 'play': return "Play the Media: play()" elif method == 'stop': @@ -30,10 +31,17 @@ return "" def setup(self, filename, mux, vcodec, vbitrate,\ - fps, acodec, abitrate, width, height, port): + fps, acodec, abitrate, width, height, port, options): + + msg = "%s %s %s %s %s %s %s" % (filename, mux, vcodec, vbitrate,\ + fps, acodec, abitrate, width, height, port) + + if len(options) > 0: + for opt in options: + msg += " %s" % opt + self.recv_pool.append("SETUP") - self.recv_pool.append("%s %s %s %s %s %s %s" % (filename, mux, vcodec, vbitrate,\ - fps, acodec, abitrate, width, height, port) + self.recv_pool.append(msg) return self.sendMsg() def play(self):