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

Apply OSD display message fix to all players

Browse Source
This commit is contained in:
Bobo 2020-06-22 22:22:34 +03:00
parent 416e553dfa
commit 10d7f44338
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/client.py
View File

@ -6,6 +6,7 @@ import os
import os.path import os.path
import random import random
import re import re
import string
import sys import sys
import threading import threading
import time import time
@ -1608,7 +1609,8 @@ class UiManager(object):
self.lastNotificationOSDEndTime = time.time() + constants.OSD_DURATION self.lastNotificationOSDEndTime = time.time() + constants.OSD_DURATION
if self.lastAlertOSDEndTime and time.time() < self.lastAlertOSDEndTime: if self.lastAlertOSDEndTime and time.time() < self.lastAlertOSDEndTime:
message = "{}{}{}".format(self.lastAlertOSDMessage, self._client._player.osdMessageSeparator, message) message = "{}{}{}".format(self.lastAlertOSDMessage, self._client._player.osdMessageSeparator, message)
self._client._player.displayMessage(message, int(duration * 1000), OSDType, mood) printableMessage = ''.join(filter(lambda x: x in set(string.printable), message))
self._client._player.displayMessage(printableMessage, int(duration * 1000), OSDType, mood)
def setControllerStatus(self, username, isController): def setControllerStatus(self, username, isController):
self.__ui.setControllerStatus(username, isController) self.__ui.setControllerStatus(username, isController)

3
syncplay/players/mpc.py
View File

@ -1,7 +1,6 @@
import os.path import os.path
import re import re
import string
import time import time
import threading import threading
import _thread import _thread
@ -92,7 +91,7 @@ class MpcHcApi:
cmessage = __OSDDATASTRUCT() cmessage = __OSDDATASTRUCT()
cmessage.nMsgPos = MsgPos cmessage.nMsgPos = MsgPos
cmessage.nDurationMS = DurationMs cmessage.nDurationMS = DurationMs
cmessage.strMsg = ''.join(filter(lambda x: x in string.printable, message)) cmessage.strMsg = message
self.__listener.SendCommand(self.CMD_OSDSHOWMESSAGE, cmessage) self.__listener.SendCommand(self.CMD_OSDSHOWMESSAGE, cmessage)
def sendRawCommand(self, cmd, value): def sendRawCommand(self, cmd, value):