Refactorization

This commit is contained in:
Uriziel 2012-06-29 16:18:49 +02:00
parent 462fbac614
commit 4b9f364120
3 changed files with 7 additions and 6 deletions

View File

@ -10,5 +10,4 @@ from syncplay import utils
if __name__ == '__main__': if __name__ == '__main__':
args = utils.get_configuration() args = utils.get_configuration()
manager = client.Manager(args.host, args.port, args.name, lambda m: mpc.run_mpc(m)) manager = client.Manager(args.host, args.port, args.name, lambda m: mpc.run_mpc(m))
thread.start_new_thread(utils.stdin_thread, (manager,))
manager.start() manager.start()

View File

@ -8,11 +8,14 @@ from syncplay.players import mpc_using_api
from syncplay import utils from syncplay import utils
if __name__ == '__main__':
args = utils.get_configuration() def prepare_args(args):
if(args.mpc_path == None): if (args.mpc_path == None):
sys.exit("You must supply mpc-path on first run") sys.exit("You must supply mpc-path on first run")
args.args.extend(['/open', '/new']) args.args.extend(['/open', '/new'])
if __name__ == '__main__':
args = utils.get_configuration()
prepare_args(args)
manager = client.Manager(args.host, args.port, args.name, lambda m: mpc_using_api.run_mpc(m, args.mpc_path, args.file, args.args)) manager = client.Manager(args.host, args.port, args.name, lambda m: mpc_using_api.run_mpc(m, args.mpc_path, args.file, args.args))
thread.start_new_thread(utils.stdin_thread, (manager,))
manager.start() manager.start()

View File

@ -13,6 +13,5 @@ if __name__ == '__main__':
args.args.extend(('-slave', '-msglevel', 'all=1:global=4')) args.args.extend(('-slave', '-msglevel', 'all=1:global=4'))
if(args.file): args.args.extend((args.file,)) if(args.file): args.args.extend((args.file,))
manager = client.Manager(args.host, args.port, args.name, lambda m: mplayer.run_mplayer(m, 'mplayer', args.args)) manager = client.Manager(args.host, args.port, args.name, lambda m: mplayer.run_mplayer(m, 'mplayer', args.args))
thread.start_new_thread(utils.stdin_thread, (manager,))
manager.start() manager.start()