From 4b9f36412090294b33fa6ec2e3c3fd7914513270 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Fri, 29 Jun 2012 16:18:49 +0200 Subject: [PATCH] Refactorization --- sync_mpc.py | 1 - sync_mpc_api.py | 11 +++++++---- sync_mplayer.py | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sync_mpc.py b/sync_mpc.py index 1ed15b6..48364cc 100755 --- a/sync_mpc.py +++ b/sync_mpc.py @@ -10,5 +10,4 @@ from syncplay import utils if __name__ == '__main__': args = utils.get_configuration() 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() diff --git a/sync_mpc_api.py b/sync_mpc_api.py index 8f23e97..e8dc19a 100644 --- a/sync_mpc_api.py +++ b/sync_mpc_api.py @@ -8,11 +8,14 @@ from syncplay.players import mpc_using_api from syncplay import utils -if __name__ == '__main__': - args = utils.get_configuration() - if(args.mpc_path == None): + +def prepare_args(args): + if (args.mpc_path == None): sys.exit("You must supply mpc-path on first run") 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)) - thread.start_new_thread(utils.stdin_thread, (manager,)) manager.start() diff --git a/sync_mplayer.py b/sync_mplayer.py index dd399ec..38ffb8c 100755 --- a/sync_mplayer.py +++ b/sync_mplayer.py @@ -13,6 +13,5 @@ if __name__ == '__main__': args.args.extend(('-slave', '-msglevel', 'all=1:global=4')) 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)) - thread.start_new_thread(utils.stdin_thread, (manager,)) manager.start()