refactoring

This commit is contained in:
Uriziel 2012-09-21 15:03:09 +02:00
parent 412f911b84
commit 0813e6b71c
3 changed files with 3 additions and 3 deletions

View File

@ -388,7 +388,7 @@ class SyncplayClientManager(object):
self.player.set_paused(True) self.player.set_paused(True)
self.askPlayer() self.askPlayer()
def updateFilename(self, filename): def updateFile(self, filename):
filename = unicode(filename, errors='replace') filename = unicode(filename, errors='replace')
self.users.currentUser.filename = filename.encode('ascii','replace') self.users.currentUser.filename = filename.encode('ascii','replace')
self.sendFilename() self.sendFilename()

View File

@ -148,7 +148,7 @@ class MPCHCAPIPlayer(object):
self.askLock.acquire() self.askLock.acquire()
position = self.__syncplayClient.getGlobalPosition() position = self.__syncplayClient.getGlobalPosition()
self.__setUpStateForNewlyOpenedFile(position) self.__setUpStateForNewlyOpenedFile(position)
self.__syncplayClient.updateFilename(str(filename.encode('ascii','replace'))) self.__syncplayClient.updateFile(str(filename.encode('ascii','replace')))
finally: finally:
self.askLock.release() self.askLock.release()

View File

@ -107,7 +107,7 @@ class MplayerProtocol(LineProcessProtocol):
def mplayer_answer_filename(self, value): def mplayer_answer_filename(self, value):
self.__syncplayClient.initPlayer(self) self.__syncplayClient.initPlayer(self)
self.__syncplayClient.updateFilename(value) self.__syncplayClient.updateFile(value)
if self.__syncplayClient.last_global_update: if self.__syncplayClient.last_global_update:
self.set_position(self.__syncplayClient.getGlobalPosition()) self.set_position(self.__syncplayClient.getGlobalPosition())
self.set_paused(True) self.set_paused(True)