From 7487ac5b2ad32231e081d57b65ae79028b8d89d3 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Fri, 21 Sep 2012 15:06:07 +0200 Subject: [PATCH] Preparations for size/length mismatch checks --- syncplay/client.py | 6 +++--- syncplay/players/mpc.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index dc9987a..841c267 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -346,7 +346,7 @@ class SyncplayClientManager(object): message = self.users.currentUser.name +' jumped to ' + format_time(self.player_position) self.ui.showMessage(message) - def sendFilename(self): + def sendPlaying(self): if self.protocol and 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.askPlayer() - def updateFile(self, filename): + def updateFile(self, filename, duration = None, path = None): filename = unicode(filename, errors='replace') self.users.currentUser.filename = filename.encode('ascii','replace') - self.sendFilename() + self.sendPlaying() def updateGlobalState(self, counter, ctime, paused, position, name): self.counter_recv = max(self.counter_recv, counter) diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index ccc44f4..d8ee908 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.updateFile(str(filename.encode('ascii','replace'))) + self.__syncplayClient.updateFile(str(filename.encode('ascii','replace')), self.mpc_api.fileduration, self.mpc_api.filepath) finally: self.askLock.release()