Revert "Apply OSD display message fix to all players"

This reverts commit 10d7f443380694a6e39d89297ce2fa46823639f8.
This commit is contained in:
Bobo 2020-06-27 21:26:27 +03:00
parent 10d7f44338
commit 9eff6ddd48
2 changed files with 3 additions and 4 deletions

View File

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

View File

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