Merge branch 'oscVoiceMute' into develop
# Conflicts: # model.py
This commit is contained in:
@@ -924,6 +924,15 @@ def callbackSetEnableAutoExportMessageLogs(value):
|
||||
else:
|
||||
model.stopLogger()
|
||||
|
||||
def callbackSetEnableVrcMicMuteSync(value):
|
||||
print("callbackSetEnableVrcMicMuteSync", value)
|
||||
config.ENABLE_VRC_MIC_MUTE_SYNC = value
|
||||
if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
|
||||
model.startCheckMuteSelfStatus()
|
||||
else:
|
||||
model.stopCheckMuteSelfStatus()
|
||||
|
||||
|
||||
def callbackSetEnableSendMessageToVrc(value):
|
||||
print("callbackSetEnableSendMessageToVrc", value)
|
||||
config.ENABLE_SEND_MESSAGE_TO_VRC = value
|
||||
@@ -978,7 +987,6 @@ def callbackSetEnableSendReceivedMessageToVrc(value):
|
||||
config.ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC = value
|
||||
# ---------------------Speaker2Chatbox---------------------
|
||||
|
||||
|
||||
# Advanced Settings Tab
|
||||
def callbackSetOscIpAddress(value):
|
||||
if value == "":
|
||||
@@ -1044,6 +1052,11 @@ def createMainWindow(splash):
|
||||
if config.ENABLE_LOGGER is True:
|
||||
model.startLogger()
|
||||
|
||||
# init OSC receive
|
||||
model.startReceiveOSC()
|
||||
if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
|
||||
model.startCheckMuteSelfStatus()
|
||||
|
||||
splash.toProgress(3) # Last one.
|
||||
|
||||
# set UI and callback
|
||||
@@ -1148,6 +1161,7 @@ def createMainWindow(splash):
|
||||
"callback_set_send_message_button_type": callbackSetSendMessageButtonType,
|
||||
"callback_set_enable_notice_xsoverlay": callbackSetEnableNoticeXsoverlay,
|
||||
"callback_set_enable_auto_export_message_logs": callbackSetEnableAutoExportMessageLogs,
|
||||
"callback_set_enable_vrc_mic_mute_sync": callbackSetEnableVrcMicMuteSync,
|
||||
"callback_set_enable_send_message_to_vrc": callbackSetEnableSendMessageToVrc,
|
||||
# Others(Message Formats(Send)
|
||||
"callback_set_send_message_format": callbackSetSendMessageFormat,
|
||||
|
||||
Reference in New Issue
Block a user