diff -r 07c12d2ceddf -r f6fc378c70e5 gmyth-stream/main.py --- a/gmyth-stream/main.py Sat Mar 31 00:55:28 2007 +0100 +++ b/gmyth-stream/main.py Mon Apr 02 20:48:43 2007 +0100 @@ -33,19 +33,30 @@ if (msg == "SETUP"): setup = server.getMsg(1024).strip().split(" ") - if ( len(setup) == 10 ): + size = len(setup) + options = [] + + if ( size < 10 ): + server.sendMsg(lib.log("Wrong SETUP command from: %s" % client[0])) + + else: + + if ( size > 10 ): + i = 10 + while (i < size): + options.append(setup[i]) + i += 1 + ret = media.setup(setup[0], setup[1], setup[2], \ setup[3], setup[4], setup[5], setup[6], setup[7], setup[8], - setup[9]) + setup[9], options) if (ret == 0): server.Ack("SETUP") else: - server.sendMsg(lib.log("File does not exist: %s" % setup[0])) + server.sendMsg(lib.log(ret)) - else: - server.sendMsg(lib.log("Wrong SETUP command from: %s" % client[0])) elif (msg == "PLAY"): media.play()