From 13586bcfe3cb20642b1e4db7fcb3fcf26d9641eb Mon Sep 17 00:00:00 2001 From: Uriziel Date: Thu, 6 Jun 2013 15:01:59 +0200 Subject: [PATCH] Pause now makes everyone sync on the position of "pauser" --- syncplay/client.py | 7 +++---- syncplay/server.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 8be0f93..9a35b48 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -168,9 +168,8 @@ class SyncplayClient(object): self.ui.showMessage(getMessage("en", "unpause-notification").format(setBy)) return madeChangeOnPlayer - def _serverPaused(self, setBy, diff): - if (diff > 0): - self.setPosition(self.getGlobalPosition()) + def _serverPaused(self, setBy): + self.setPosition(self.getGlobalPosition()) self._player.setPaused(True) madeChangeOnPlayer = True self.ui.showMessage(getMessage("en", "pause-notification").format(setBy)) @@ -217,7 +216,7 @@ class SyncplayClient(object): if (paused == False and pauseChanged): madeChangeOnPlayer = self._serverUnpaused(setBy) elif (paused == True and pauseChanged): - madeChangeOnPlayer = self._serverPaused(setBy, diff) + madeChangeOnPlayer = self._serverPaused(setBy) return madeChangeOnPlayer def _executePlaystateHooks(self, position, paused, doSeek, setBy, latency): diff --git a/syncplay/server.py b/syncplay/server.py index 6a09267..88f1221 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -206,11 +206,11 @@ class SyncFactory(Factory): watcher.lastUpdate = time.time() if(watcher.file): oldPosition = self._roomStates[watcher.room]["position"] - if(position is not None): - self.__updatePositionState(position, doSeek, watcher) pauseChanged = False if(paused is not None): pauseChanged = self.__updatePausedState(paused, watcher) + if(position is not None): + self.__updatePositionState(position, doSeek or pauseChanged, watcher) forceUpdate = self.__shouldServerForceUpdateOnRoom(pauseChanged, doSeek) if(forceUpdate): if(self.ircVerbose):