From 0813e6b71c8ef58619032754ba2affd0b03f5188 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Fri, 21 Sep 2012 15:03:09 +0200 Subject: [PATCH] refactoring --- syncplay/client.py | 2 +- syncplay/players/mpc.py | 2 +- syncplay/players/mplayer.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index c0b5d40..dc9987a 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -388,7 +388,7 @@ class SyncplayClientManager(object): self.player.set_paused(True) self.askPlayer() - def updateFilename(self, filename): + def updateFile(self, filename): filename = unicode(filename, errors='replace') self.users.currentUser.filename = filename.encode('ascii','replace') self.sendFilename() diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index 7719589..ccc44f4 100644 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -148,7 +148,7 @@ class MPCHCAPIPlayer(object): self.askLock.acquire() position = self.__syncplayClient.getGlobalPosition() self.__setUpStateForNewlyOpenedFile(position) - self.__syncplayClient.updateFilename(str(filename.encode('ascii','replace'))) + self.__syncplayClient.updateFile(str(filename.encode('ascii','replace'))) finally: self.askLock.release() diff --git a/syncplay/players/mplayer.py b/syncplay/players/mplayer.py index 433c1d4..32c7661 100644 --- a/syncplay/players/mplayer.py +++ b/syncplay/players/mplayer.py @@ -107,7 +107,7 @@ class MplayerProtocol(LineProcessProtocol): def mplayer_answer_filename(self, value): self.__syncplayClient.initPlayer(self) - self.__syncplayClient.updateFilename(value) + self.__syncplayClient.updateFile(value) if self.__syncplayClient.last_global_update: self.set_position(self.__syncplayClient.getGlobalPosition()) self.set_paused(True)