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

Pause on leave = joint notification

Browse Source
This commit is contained in:
Et0h 2014-05-28 20:27:13 +01:00
parent e257c24c03
commit 35ba80fc49
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/client.py
View File

@ -55,6 +55,8 @@ class SyncClientFactory(ClientFactory):
class SyncplayClient(object): class SyncplayClient(object):
def __init__(self, playerClass, ui, config): def __init__(self, playerClass, ui, config):
self.lastLeftTime = 0
self.lastLeftUser = u""
self.protocolFactory = SyncClientFactory(self) self.protocolFactory = SyncClientFactory(self)
self.ui = UiManager(self, ui) self.ui = UiManager(self, ui)
self.userlist = SyncplayUserlist(self.ui, self) self.userlist = SyncplayUserlist(self.ui, self)
@ -182,7 +184,10 @@ class SyncplayClient(object):
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), hideFromOSD) if (self.lastLeftTime < time.time() - constants.OSD_DURATION) or (hideFromOSD == True):
self.ui.showMessage(getMessage("en", "pause-notification").format(setBy), hideFromOSD)
else:
self.ui.showMessage(getMessage("en", "left-paused-notification").format(self.lastLeftUser, setBy), hideFromOSD)
return madeChangeOnPlayer return madeChangeOnPlayer
def _serverSeeked(self, position, setBy): def _serverSeeked(self, position, setBy):
@ -542,6 +547,8 @@ class SyncplayUserlist(object):
self._users.pop(username) self._users.pop(username)
message = getMessage("en", "left-notification").format(username) message = getMessage("en", "left-notification").format(username)
self.ui.showMessage(message, hideFromOSD) self.ui.showMessage(message, hideFromOSD)
self._client.lastLeftTime = time.time()
self._client.lastLeftUser = username
self.userListChange() self.userListChange()
def __displayModUserMessage(self, username, room, file_, user, oldRoom): def __displayModUserMessage(self, username, room, file_, user, oldRoom):

1
syncplay/messages.py
View File

@ -25,6 +25,7 @@ en = {
"room-join-notification" : "<{}> has joined the room: '{}'", # User "room-join-notification" : "<{}> has joined the room: '{}'", # User
"left-notification" : "<{}> has left", # User "left-notification" : "<{}> has left", # User
"left-paused-notification" : "<{}> left, <{}> paused", # User who left, User who paused
"playing-notification" : "<{}> is playing '{}' ({})", # User, file, duration "playing-notification" : "<{}> is playing '{}' ({})", # User, file, duration
"playing-notification/room-addendum" : " in room: '{}'", # Room "playing-notification/room-addendum" : " in room: '{}'", # Room