Merge branch 'oscVoiceMute' of https://github.com/misyaguziya/VRCT into oscVoiceMute

# Conflicts:
#	model.py

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):

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

model.py

@@ -229,7 +229,7 @@ class Model:
         self.mute_status = getOSCParameterValue(address=osc_parameter_prefix + param_MuteSelf)
 
         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
@@ -237,6 +237,12 @@ class Model:
                     self.startPutQueueMicAudio()
                     self.mute_status = False
 
+        def change_handler_voice(address, osc_arguments):
+            if config.ENABLE_VRC_MIC_MUTE_SYNC is True:
+                if self.mute_status is True:
+                    self.startPutQueueMicAudio()
+                    self.mute_status = False
+
         dict_filter_and_target = {
             osc_parameter_prefix + param_MuteSelf: change_handler_mute,
         }

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")),