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

Ignore manual pause if can't control + (mostly) honour OSD options for isReady

Browse Source
This commit is contained in:
Et0h 2014-12-06 19:01:46 +00:00
parent 90c3ca2ab0
commit 0a924ac299
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/client.py
View File

@ -159,7 +159,7 @@ class SyncplayClient(object):
pauseChange, seeked = self._determinePlayerStateChange(paused, position) pauseChange, seeked = self._determinePlayerStateChange(paused, position)
self._playerPosition = position self._playerPosition = position
self._playerPaused = paused self._playerPaused = paused
if pauseChange and utils.meetsMinVersion(self.serverVersion, constants.USER_READY_MIN_VERSION): if pauseChange and utils.meetsMinVersion(self.serverVersion, constants.USER_READY_MIN_VERSION) and self.userlist.currentUser.canControl():
lastPausedDiff = time.time() - self.lastPausedOnLeaveTime if self.lastPausedOnLeaveTime else None lastPausedDiff = time.time() - self.lastPausedOnLeaveTime if self.lastPausedOnLeaveTime else None
if lastPausedDiff is not None and lastPausedDiff < constants.LAST_PAUSED_DIFF_THRESHOLD: if lastPausedDiff is not None and lastPausedDiff < constants.LAST_PAUSED_DIFF_THRESHOLD:
self.lastPausedOnLeaveTime = None self.lastPausedOnLeaveTime = None
@ -499,11 +499,16 @@ class SyncplayClient(object):
self.userlist.setReady(username, isReady) self.userlist.setReady(username, isReady)
self.ui.userListChange() self.ui.userListChange()
if oldReadyState != isReady: if oldReadyState != isReady:
showOnOSD = constants.SHOW_OSD_WARNINGS
if constants.SHOW_NONCONTROLLER_OSD == False and self.userlist.canControl(username) == False and self.userlist.currentUser.isController() == False:
# Ignore SHOW_NONCONTROLLER_OSD setting if user is controller, because they need to know who is/isn't ready
showOnOSD = False
hideFromOSD = not showOnOSD
if isReady: if isReady:
message = "<{}> I'm ready".format(username) message = "<{}> I'm ready".format(username)
else: else:
message = "<{}> I'm not ready".format(username) message = "<{}> I'm not ready".format(username)
self.ui.showMessage(message) self.ui.showMessage(message, hideFromOSD)
@requireMinServerVersion(constants.CONTROLLED_ROOMS_MIN_VERSION) @requireMinServerVersion(constants.CONTROLLED_ROOMS_MIN_VERSION)
def createControlledRoom(self, roomName): def createControlledRoom(self, roomName):