diff --git a/run_sync_server.py b/run_sync_server.py index 262f24d..f7b57bb 100755 --- a/run_sync_server.py +++ b/run_sync_server.py @@ -3,9 +3,9 @@ from twisted.internet import reactor from syncplay.server import SyncFactory -from syncplay import utils +from syncplay.ConfigurationGetter import ServerConfigurationGetter -argsGetter = utils.ServerConfigurationGetter() +argsGetter = ServerConfigurationGetter() args = argsGetter.getConfiguration() reactor.listenTCP(args.port, SyncFactory(args.password, args.isolate_rooms)) reactor.run() diff --git a/syncplay/SyncplayMPC.py b/syncplay/SyncplayMPC.py index 66be344..5b21d59 100644 --- a/syncplay/SyncplayMPC.py +++ b/syncplay/SyncplayMPC.py @@ -7,7 +7,8 @@ from syncplay.ConfigurationGetter import MPCConfigurationGetter class SyncplayMPC(SyncplayClient): def __init__(self): SyncplayClient.__init__(self) - syncplayClient = SyncplayClientManager(self.args.name, lambda m: mpc.run_mpc(m, self.args.mpc_path, self.args.file, self.args._args), self.interface, self.args.debug, self.args.room, self.args.password) + run_mpc = lambda m: mpc.run_mpc(m, self.args.mpc_path, self.args.file, self.args._args) + syncplayClient = SyncplayClientManager(self.args.name, run_mpc, self.interface, self.args.debug, self.args.room, self.args.password) self.interface.addClient(syncplayClient) syncplayClient.start(self.args.host, self.args.port) diff --git a/syncplay/SyncplayMplayer.py b/syncplay/SyncplayMplayer.py index 9919402..209d7b0 100644 --- a/syncplay/SyncplayMplayer.py +++ b/syncplay/SyncplayMplayer.py @@ -7,7 +7,8 @@ from syncplay.ConfigurationGetter import ConfigurationGetter class SyncplayMplayer(SyncplayClient): def __init__(self): SyncplayClient.__init__(self) - syncplayClient = SyncplayClientManager(self.args.name, lambda m: mplayer.run_mplayer(m, 'mplayer', self.args._args), self.interface, self.args.debug, self.args.room, self.args.password) + run_mplayer = lambda m: mplayer.run_mplayer(m, 'mplayer', self.args._args) + syncplayClient = SyncplayClientManager(self.args.name, run_mplayer, self.interface, self.args.debug, self.args.room, self.args.password) self.interface.addClient(syncplayClient) syncplayClient.start(self.args.host, self.args.port)