every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'remove_s2c_pass' into for_webui

Browse Source
This commit is contained in:
misyaguziya
2024-10-16 21:28:22 +09:00
parent fd0cadab8c 49128d2657
commit 0198da50d6
3 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src-python/config.py
View File

@@ -37,10 +37,6 @@ class Config:
def VERSION(self):
return self._VERSION
@property
def SPEAKER2CHATBOX_PASS_CONFIRMATION(self):
return self._SPEAKER2CHATBOX_PASS_CONFIRMATION
@property
def PATH_LOCAL(self):
return self._PATH_LOCAL
@@ -118,15 +114,6 @@ class Config:
return self._WATCHDOG_INTERVAL
# Read Write
@property
def ENABLE_SPEAKER2CHATBOX(self):
return self._ENABLE_SPEAKER2CHATBOX
@ENABLE_SPEAKER2CHATBOX.setter
def ENABLE_SPEAKER2CHATBOX(self, value):
if isinstance(value, bool):
self._ENABLE_SPEAKER2CHATBOX = value
@property
def ENABLE_TRANSLATION(self):
return self._ENABLE_TRANSLATION
@@ -909,18 +896,6 @@ class Config:
self._RECEIVED_MESSAGE_FORMAT_WITH_T = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
# Speaker2Chatbox------------------
@property
@json_serializable('SPEAKER2CHATBOX_PASS')
def SPEAKER2CHATBOX_PASS(self):
return self._SPEAKER2CHATBOX_PASS
@SPEAKER2CHATBOX_PASS.setter
def SPEAKER2CHATBOX_PASS(self, value):
if isinstance(value, str):
self._SPEAKER2CHATBOX_PASS = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('SEND_RECEIVED_MESSAGE_TO_VRC')
def SEND_RECEIVED_MESSAGE_TO_VRC(self):
@@ -929,14 +904,8 @@ class Config:
@SEND_RECEIVED_MESSAGE_TO_VRC.setter
def SEND_RECEIVED_MESSAGE_TO_VRC(self, value):
if isinstance(value, bool):
if self._ENABLE_SPEAKER2CHATBOX is True:
self._SEND_RECEIVED_MESSAGE_TO_VRC = value
else:
self._SEND_RECEIVED_MESSAGE_TO_VRC = False
self._SEND_RECEIVED_MESSAGE_TO_VRC = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
# Speaker2Chatbox------------------
@property
@json_serializable('LOGGER_FEATURE')
@@ -963,8 +932,6 @@ class Config:
def init_config(self):
# Read Only
self._VERSION = "2.2.5"
self._ENABLE_SPEAKER2CHATBOX = False # Speaker2Chatbox
self._SPEAKER2CHATBOX_PASS_CONFIRMATION = "VRCT=0YEN"
if getattr(sys, 'frozen', False):
self._PATH_LOCAL = os_path.dirname(sys.executable)
else:
@@ -1165,8 +1132,7 @@ class Config:
}
self._OVERLAY_UI_TYPE = "default"
self._SEND_MESSAGE_TO_VRC = True
self._SEND_RECEIVED_MESSAGE_TO_VRC = False # Speaker2Chatbox
self._SPEAKER2CHATBOX_PASS = "000000000"
self._SEND_RECEIVED_MESSAGE_TO_VRC = False
self._LOGGER_FEATURE = False
self._VRC_MIC_MUTE_SYNC = False
@@ -1181,10 +1147,6 @@ class Config:
old_message_format = config[key]
setattr(self, key, config[key])
if key == "SPEAKER2CHATBOX_PASS":
if self.SPEAKER2CHATBOX_PASS_CONFIRMATION == config[key]:
self.ENABLE_SPEAKER2CHATBOX = True
if old_message_format is not None:
setattr(self, "SEND_MESSAGE_FORMAT_WITH_T", old_message_format)

19
src-python/webui_controller.py
View File

@@ -247,13 +247,9 @@ class Controller:
# overlay_image = model.createOverlayImageLong("receive", message, translation)
# model.updateOverlay(overlay_image)
# ------------Speaker2Chatbox------------
if config.ENABLE_SPEAKER2CHATBOX is True:
# send OSC message
if config.SEND_RECEIVED_MESSAGE_TO_VRC is True:
osc_message = self.messageFormatter("RECEIVED", translation, [message])
model.oscSendMessage(osc_message)
# ------------Speaker2Chatbox------------
if config.SEND_RECEIVED_MESSAGE_TO_VRC is True:
osc_message = self.messageFormatter("RECEIVED", translation, [message])
model.oscSendMessage(osc_message)
# update textbox message log (Received)
self.run(
@@ -1279,15 +1275,6 @@ class Controller:
config.RECEIVED_MESSAGE_FORMAT_WITH_T = data
return {"status":200, "result":config.RECEIVED_MESSAGE_FORMAT_WITH_T}
@staticmethod
def getSpeaker2ChatboxPass(*args, **kwargs) -> dict:
return {"status":200, "result":config.SPEAKER2CHATBOX_PASS}
@staticmethod
def setSpeaker2ChatboxPass(data, *args, **kwargs) -> dict:
config.SPEAKER2CHATBOX_PASS = data
return {"status":200, "result":config.SPEAKER2CHATBOX_PASS}
@staticmethod
def getSendReceivedMessageToVrc(*args, **kwargs) -> dict:
return {"status":200, "result":config.SEND_RECEIVED_MESSAGE_TO_VRC}

3
src-python/webui_mainloop.py
View File

@@ -289,9 +289,6 @@ mapping = {
"/get/data/received_message_format_with_t": {"status": True, "variable":controller.getReceivedMessageFormatWithT},
"/set/data/received_message_format_with_t": {"status": True, "variable":controller.setReceivedMessageFormatWithT},
"/get/data/speaker2chatbox_pass": {"status": True, "variable":controller.getSpeaker2ChatboxPass},
"/set/data/speaker2chatbox_pass": {"status": True, "variable":controller.setSpeaker2ChatboxPass},
"/get/data/send_received_message_to_vrc": {"status": True, "variable":controller.getSendReceivedMessageToVrc},
"/set/enable/send_received_message_to_vrc": {"status": True, "variable":controller.setEnableSendReceivedMessageToVrc},
"/set/disable/send_received_message_to_vrc": {"status": True, "variable":controller.setDisableSendReceivedMessageToVrc},