From bd0a0e45921b841851ada910a0947a18c318d11f Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 2 May 2024 14:25:21 +0900 Subject: [PATCH] =?UTF-8?q?[Chore]=20=E5=A4=89=E6=95=B0=E5=90=8D=E5=A4=89?= =?UTF-8?q?=E6=9B=B4:=20config.ENABLE=5FMUTE=5FDETECT=20->=20config.ENABLE?= =?UTF-8?q?=5FVRC=5FMIC=5FMUTE=5FSYNC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 14 +++++++------- controller.py | 6 +++--- model.py | 4 ++-- view.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config.py b/config.py index 87efb0d6..8fd1942e 100644 --- a/config.py +++ b/config.py @@ -831,14 +831,14 @@ class Config: saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property - @json_serializable('ENABLE_MUTE_DETECT') - def ENABLE_MUTE_DETECT(self): - return self._ENABLE_MUTE_DETECT + @json_serializable('ENABLE_VRC_MIC_MUTE_SYNC') + def ENABLE_VRC_MIC_MUTE_SYNC(self): + return self._ENABLE_VRC_MIC_MUTE_SYNC - @ENABLE_MUTE_DETECT.setter - def ENABLE_MUTE_DETECT(self, value): + @ENABLE_VRC_MIC_MUTE_SYNC.setter + def ENABLE_VRC_MIC_MUTE_SYNC(self, value): if isinstance(value, bool): - self._ENABLE_MUTE_DETECT = value + self._ENABLE_VRC_MIC_MUTE_SYNC = value saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) @property @@ -1006,7 +1006,7 @@ class Config: self._ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC = False # Speaker2Chatbox self._ENABLE_SPEAKER2CHATBOX_PASS = "000000000" self._ENABLE_LOGGER = False - self._ENABLE_MUTE_DETECT = False + self._ENABLE_VRC_MIC_MUTE_SYNC = False self._IS_CONFIG_WINDOW_COMPACT_MODE = False def load_config(self): diff --git a/controller.py b/controller.py index 455cbfb7..6f4f586c 100644 --- a/controller.py +++ b/controller.py @@ -857,7 +857,7 @@ def callbackSetEnableAutoExportMessageLogs(value): def callbackSetEnableVrcMicMuteSync(value): print("callbackSetEnableVrcMicMuteSync", value) - config.ENABLE_MUTE_DETECT = value + config.ENABLE_VRC_MIC_MUTE_SYNC = value def callbackSetEnableSendMessageToVrc(value): print("callbackSetEnableSendMessageToVrc", value) @@ -919,7 +919,7 @@ def createDictOSCReceiveParameters(): param_Voice = "Voice" def change_handler_mute(address, osc_arguments): - if config.ENABLE_MUTE_DETECT is True: + if config.ENABLE_VRC_MIC_MUTE_SYNC is True: if osc_arguments is True and change_handler_mute.status_mute is False: model.stopPutQueueMicAudio() change_handler_mute.status_mute = True @@ -928,7 +928,7 @@ def createDictOSCReceiveParameters(): change_handler_mute.status_mute = False def change_handler_voice(address, osc_arguments): - if config.ENABLE_MUTE_DETECT is True: + if config.ENABLE_VRC_MIC_MUTE_SYNC is True: if change_handler_mute.status_mute is True: model.startPutQueueMicAudio() change_handler_mute.status_mute = False diff --git a/model.py b/model.py index 700e5f0e..8bf62554 100644 --- a/model.py +++ b/model.py @@ -230,7 +230,7 @@ class Model: param_Voice = "Voice" def change_handler_mute(address, osc_arguments): - if config.ENABLE_MUTE_DETECT is True: + if config.ENABLE_VRC_MIC_MUTE_SYNC is True: if osc_arguments is True and self.mute_status is False: self.stopPutQueueMicAudio() self.mute_status = True @@ -239,7 +239,7 @@ class Model: self.mute_status = False def change_handler_voice(address, osc_arguments): - if config.ENABLE_MUTE_DETECT is True: + if config.ENABLE_VRC_MIC_MUTE_SYNC is True: if self.mute_status is True: self.startPutQueueMicAudio() self.mute_status = False diff --git a/view.py b/view.py index 56858a4f..38cfaae2 100644 --- a/view.py +++ b/view.py @@ -449,7 +449,7 @@ class View(): VAR_LABEL_ENABLE_VRC_MIC_MUTE_SYNC=StringVar(value=i18n.t("config_window.vrc_mic_mute_sync.label")), VAR_DESC_ENABLE_VRC_MIC_MUTE_SYNC=StringVar(value=i18n.t("config_window.vrc_mic_mute_sync.desc")), CALLBACK_SET_ENABLE_VRC_MIC_MUTE_SYNC=None, - VAR_ENABLE_VRC_MIC_MUTE_SYNC=BooleanVar(value=config.ENABLE_MUTE_DETECT), + VAR_ENABLE_VRC_MIC_MUTE_SYNC=BooleanVar(value=config.ENABLE_VRC_MIC_MUTE_SYNC), VAR_LABEL_ENABLE_SEND_MESSAGE_TO_VRC=StringVar(value=i18n.t("config_window.send_message_to_vrc.label")),