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

Never slowdown/rewind/fastforward due to time difference with yourself

Browse Source
This commit is contained in:
Et0h 2015-04-06 12:24:46 +01:00
parent 2f7874856d
commit c8912d13f7
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
syncplay/client.py
View File

@ -206,17 +206,25 @@ class SyncplayClient(object):
return madeChangeOnPlayer return madeChangeOnPlayer
def _rewindPlayerDueToTimeDifference(self, position, setBy): def _rewindPlayerDueToTimeDifference(self, position, setBy):
hideFromOSD = not constants.SHOW_SAME_ROOM_OSD madeChangeOnPlayer = False
self.setPosition(position) if self.getUsername() == setBy:
self.ui.showMessage(getMessage("rewind-notification").format(setBy), hideFromOSD) self.ui.showDebugMessage("Caught attempt to rewind due to time difference with self")
madeChangeOnPlayer = True else:
hideFromOSD = not constants.SHOW_SAME_ROOM_OSD
self.setPosition(position)
self.ui.showMessage(getMessage("rewind-notification").format(setBy), hideFromOSD)
madeChangeOnPlayer = True
return madeChangeOnPlayer return madeChangeOnPlayer
def _fastforwardPlayerDueToTimeDifference(self, position, setBy): def _fastforwardPlayerDueToTimeDifference(self, position, setBy):
hideFromOSD = not constants.SHOW_SAME_ROOM_OSD madeChangeOnPlayer = False
self.setPosition(position + constants.FASTFORWARD_EXTRA_TIME) if self.getUsername() == setBy:
self.ui.showMessage(getMessage("fastforward-notification").format(setBy), hideFromOSD) self.ui.showDebugMessage("Caught attempt to fastforward due to time difference with self")
madeChangeOnPlayer = True else:
hideFromOSD = not constants.SHOW_SAME_ROOM_OSD
self.setPosition(position + constants.FASTFORWARD_EXTRA_TIME)
self.ui.showMessage(getMessage("fastforward-notification").format(setBy), hideFromOSD)
madeChangeOnPlayer = True
return madeChangeOnPlayer return madeChangeOnPlayer
def _serverUnpaused(self, setBy): def _serverUnpaused(self, setBy):
@ -252,15 +260,20 @@ class SyncplayClient(object):
def _slowDownToCoverTimeDifference(self, diff, setBy): def _slowDownToCoverTimeDifference(self, diff, setBy):
hideFromOSD = not constants.SHOW_SLOWDOWN_OSD hideFromOSD = not constants.SHOW_SLOWDOWN_OSD
madeChangeOnPlayer = False
if self._config['slowdownThreshold'] < diff and not self._speedChanged: if self._config['slowdownThreshold'] < diff and not self._speedChanged:
self._player.setSpeed(constants.SLOWDOWN_RATE) if self.getUsername() == setBy:
self._speedChanged = True self.ui.showDebugMessage("Caught attempt to slow down due to time difference with self")
self.ui.showMessage(getMessage("slowdown-notification").format(setBy), hideFromOSD) else:
self._player.setSpeed(constants.SLOWDOWN_RATE)
self._speedChanged = True
self.ui.showMessage(getMessage("slowdown-notification").format(setBy), hideFromOSD)
madeChangeOnPlayer = True
elif self._speedChanged and diff < constants.SLOWDOWN_RESET_THRESHOLD: elif self._speedChanged and diff < constants.SLOWDOWN_RESET_THRESHOLD:
self._player.setSpeed(1.00) self._player.setSpeed(1.00)
self._speedChanged = False self._speedChanged = False
self.ui.showMessage(getMessage("revert-notification"), hideFromOSD) self.ui.showMessage(getMessage("revert-notification"), hideFromOSD)
madeChangeOnPlayer = True madeChangeOnPlayer = True
return madeChangeOnPlayer return madeChangeOnPlayer
def _changePlayerStateAccordingToGlobalState(self, position, paused, doSeek, setBy): def _changePlayerStateAccordingToGlobalState(self, position, paused, doSeek, setBy):