1.1 --- a/gmyth-stream/server/plugins/comm/xmlrpc.py	Tue Apr 03 16:42:04 2007 +0100
     1.2 +++ b/gmyth-stream/server/plugins/comm/xmlrpc.py	Tue Apr 10 23:24:53 2007 +0100
     1.3 @@ -15,7 +15,8 @@
     1.4      def _methodHelp(self, method):
     1.5  
     1.6          if method == 'setup':
     1.7 -            return "Setup the Media: setup( filename, mux, vcodec, vbitrate, fps, acodec, abitrate, width, height, port"
     1.8 +            return "Setup the Media: setup( filename, mux, vcodec, vbitrate,"\
     1.9 +                   " fps, acodec, abitrate, width, height, port, options"
    1.10          elif method == 'play':
    1.11              return "Play the Media: play()"
    1.12          elif method == 'stop':
    1.13 @@ -30,10 +31,17 @@
    1.14              return ""
    1.15  
    1.16      def setup(self, filename, mux, vcodec, vbitrate,\
    1.17 -            fps, acodec, abitrate, width, height, port):
    1.18 +            fps, acodec, abitrate, width, height, port, options):
    1.19 +
    1.20 +        msg = "%s %s %s %s %s %s %s" % (filename, mux, vcodec, vbitrate,\
    1.21 +                                        fps, acodec, abitrate, width, height, port)
    1.22 +
    1.23 +        if len(options) > 0:
    1.24 +            for opt in options:
    1.25 +                msg += " %s" % opt
    1.26 +
    1.27          self.recv_pool.append("SETUP")
    1.28 -        self.recv_pool.append("%s %s %s %s %s %s %s" % (filename, mux, vcodec, vbitrate,\
    1.29 -                                                        fps, acodec, abitrate, width, height, port)
    1.30 +        self.recv_pool.append(msg)
    1.31          return self.sendMsg()
    1.32  
    1.33      def play(self):