Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Preparations for size/length mismatch checks

Browse Source
This commit is contained in:
Uriziel 2012-09-21 15:06:07 +02:00
parent 0813e6b71c
commit 7487ac5b2a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/client.py
View File

@ -346,7 +346,7 @@ class SyncplayClientManager(object):
message = self.users.currentUser.name +' jumped to ' + format_time(self.player_position) message = self.users.currentUser.name +' jumped to ' + format_time(self.player_position)
self.ui.showMessage(message) self.ui.showMessage(message)
def sendFilename(self): def sendPlaying(self):
if self.protocol and self.users.currentUser.filename: if self.protocol and self.users.currentUser.filename:
self.protocol.sender.send_playing(self.users.currentUser.filename) self.protocol.sender.send_playing(self.users.currentUser.filename)
@ -388,10 +388,10 @@ class SyncplayClientManager(object):
self.player.set_paused(True) self.player.set_paused(True)
self.askPlayer() self.askPlayer()
def updateFile(self, filename): def updateFile(self, filename, duration = None, path = None):
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.sendPlaying()
def updateGlobalState(self, counter, ctime, paused, position, name): def updateGlobalState(self, counter, ctime, paused, position, name):
self.counter_recv = max(self.counter_recv, counter) self.counter_recv = max(self.counter_recv, counter)

2
syncplay/players/mpc.py
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.updateFile(str(filename.encode('ascii','replace'))) self.__syncplayClient.updateFile(str(filename.encode('ascii','replace')), self.mpc_api.fileduration, self.mpc_api.filepath)
finally: finally:
self.askLock.release() self.askLock.release()