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

Pause now makes everyone sync on the position of "pauser"

Browse Source
This commit is contained in:
Uriziel 2013-06-06 15:01:59 +02:00
parent ad37e04c07
commit 13586bcfe3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncplay/client.py
View File

@ -168,9 +168,8 @@ class SyncplayClient(object):
self.ui.showMessage(getMessage("en", "unpause-notification").format(setBy)) self.ui.showMessage(getMessage("en", "unpause-notification").format(setBy))
return madeChangeOnPlayer return madeChangeOnPlayer
def _serverPaused(self, setBy, diff): def _serverPaused(self, setBy):
if (diff > 0): self.setPosition(self.getGlobalPosition())
self.setPosition(self.getGlobalPosition())
self._player.setPaused(True) self._player.setPaused(True)
madeChangeOnPlayer = True madeChangeOnPlayer = True
self.ui.showMessage(getMessage("en", "pause-notification").format(setBy)) self.ui.showMessage(getMessage("en", "pause-notification").format(setBy))
@ -217,7 +216,7 @@ class SyncplayClient(object):
if (paused == False and pauseChanged): if (paused == False and pauseChanged):
madeChangeOnPlayer = self._serverUnpaused(setBy) madeChangeOnPlayer = self._serverUnpaused(setBy)
elif (paused == True and pauseChanged): elif (paused == True and pauseChanged):
madeChangeOnPlayer = self._serverPaused(setBy, diff) madeChangeOnPlayer = self._serverPaused(setBy)
return madeChangeOnPlayer return madeChangeOnPlayer
def _executePlaystateHooks(self, position, paused, doSeek, setBy, latency): def _executePlaystateHooks(self, position, paused, doSeek, setBy, latency):

4
syncplay/server.py
View File

@ -206,11 +206,11 @@ class SyncFactory(Factory):
watcher.lastUpdate = time.time() watcher.lastUpdate = time.time()
if(watcher.file): if(watcher.file):
oldPosition = self._roomStates[watcher.room]["position"] oldPosition = self._roomStates[watcher.room]["position"]
if(position is not None):
self.__updatePositionState(position, doSeek, watcher)
pauseChanged = False pauseChanged = False
if(paused is not None): if(paused is not None):
pauseChanged = self.__updatePausedState(paused, watcher) pauseChanged = self.__updatePausedState(paused, watcher)
if(position is not None):
self.__updatePositionState(position, doSeek or pauseChanged, watcher)
forceUpdate = self.__shouldServerForceUpdateOnRoom(pauseChanged, doSeek) forceUpdate = self.__shouldServerForceUpdateOnRoom(pauseChanged, doSeek)
if(forceUpdate): if(forceUpdate):
if(self.ircVerbose): if(self.ircVerbose):