mirror of https://github.com/Syncplay/syncplay
Do not show playback speed change notifications in OSD
This commit is contained in:
parent
aeada06d33
commit
2eacee571d
|
@ -39,7 +39,7 @@ except:
|
||||||
from syncplay import utils, constants, version
|
from syncplay import utils, constants, version
|
||||||
from syncplay.constants import PRIVACY_SENDHASHED_MODE, PRIVACY_DONTSEND_MODE, \
|
from syncplay.constants import PRIVACY_SENDHASHED_MODE, PRIVACY_DONTSEND_MODE, \
|
||||||
PRIVACY_HIDDENFILENAME
|
PRIVACY_HIDDENFILENAME
|
||||||
from syncplay.messages import getMissingStrings, getMessage
|
from syncplay.messages import getMissingStrings, getMessage, isNoOSDMessage
|
||||||
from syncplay.protocols import SyncClientProtocol
|
from syncplay.protocols import SyncClientProtocol
|
||||||
from syncplay.utils import isMacOS
|
from syncplay.utils import isMacOS
|
||||||
|
|
||||||
|
@ -1601,6 +1601,10 @@ class UiManager(object):
|
||||||
self.__ui.showUserList(currentUser, rooms)
|
self.__ui.showUserList(currentUser, rooms)
|
||||||
|
|
||||||
def showOSDMessage(self, message, duration=constants.OSD_DURATION, OSDType=constants.OSD_NOTIFICATION, mood=constants.MESSAGE_NEUTRAL):
|
def showOSDMessage(self, message, duration=constants.OSD_DURATION, OSDType=constants.OSD_NOTIFICATION, mood=constants.MESSAGE_NEUTRAL):
|
||||||
|
if(isNoOSDMessage(message)):
|
||||||
|
print("SKIPPED !!!!! {}".format(message))
|
||||||
|
return
|
||||||
|
|
||||||
autoplayConditionsMet = self._client.autoplayConditionsMet()
|
autoplayConditionsMet = self._client.autoplayConditionsMet()
|
||||||
if OSDType == constants.OSD_ALERT and not constants.SHOW_OSD_WARNINGS and not self._client.autoplayTimerIsRunning():
|
if OSDType == constants.OSD_ALERT and not constants.SHOW_OSD_WARNINGS and not self._client.autoplayTimerIsRunning():
|
||||||
return
|
return
|
||||||
|
|
|
@ -9,6 +9,7 @@ from . import messages_es
|
||||||
from . import messages_pt_BR
|
from . import messages_pt_BR
|
||||||
from . import messages_pt_PT
|
from . import messages_pt_PT
|
||||||
from . import messages_tr
|
from . import messages_tr
|
||||||
|
import re
|
||||||
|
|
||||||
messages = {
|
messages = {
|
||||||
"de": messages_de.de,
|
"de": messages_de.de,
|
||||||
|
@ -22,6 +23,10 @@ messages = {
|
||||||
"CURRENT": None
|
"CURRENT": None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
no_osd_message_list = [
|
||||||
|
"slowdown-notification",
|
||||||
|
"revert-notification",
|
||||||
|
]
|
||||||
|
|
||||||
def getLanguages():
|
def getLanguages():
|
||||||
langList = {}
|
langList = {}
|
||||||
|
@ -30,11 +35,17 @@ def getLanguages():
|
||||||
langList[lang] = getMessage("LANGUAGE", lang)
|
langList[lang] = getMessage("LANGUAGE", lang)
|
||||||
return langList
|
return langList
|
||||||
|
|
||||||
|
def isNoOSDMessage(message):
|
||||||
|
for no_osd_message in no_osd_message_list:
|
||||||
|
regex = "^" + getMessage(no_osd_message).replace("{}", ".+") + "$"
|
||||||
|
regex_test = bool(re.match(regex, message))
|
||||||
|
if regex_test:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
def setLanguage(lang):
|
def setLanguage(lang):
|
||||||
messages["CURRENT"] = lang
|
messages["CURRENT"] = lang
|
||||||
|
|
||||||
|
|
||||||
def getMissingStrings():
|
def getMissingStrings():
|
||||||
missingStrings = ""
|
missingStrings = ""
|
||||||
for lang in messages:
|
for lang in messages:
|
||||||
|
|
Loading…
Reference in New Issue