👍️[Update] Model : ミュート同期の処理を見直し

src-python/model.py

@@ -97,7 +97,6 @@ class Model:
         self.th_overlay = None
         self.mic_audio_queue = None
         self.mic_mute_status = None
-        self.mic_mute_status_check = None
         self.kks = kakasi()
         self.watchdog = Watchdog(config.WATCHDOG_TIMEOUT, config.WATCHDOG_INTERVAL)
         self.osc_handler = OSCHandler(config.OSC_IP_ADDRESS, config.OSC_PORT)
@@ -305,26 +304,12 @@ class Model:
     def getMuteSelfStatus(self):
         return self.osc_handler.getOSCParameterMuteSelf()
 
-    def startCheckMuteSelfStatus(self):
-        def checkMuteSelfStatus():
-            status = self.getMuteSelfStatus()
-            if status is not None:
-                self.mic_mute_status = status
-                self.changeMicTranscriptStatus()
-                self.stopCheckMuteSelfStatus()
-
-        if not isinstance(self.mic_mute_status_check, threadFnc):
-            self.mic_mute_status_check = threadFnc(checkMuteSelfStatus)
-            self.mic_mute_status_check.daemon = True
-            self.mic_mute_status_check.start()
-
-    def stopCheckMuteSelfStatus(self):
-        if isinstance(self.mic_mute_status_check, threadFnc):
-            self.mic_mute_status_check.stop()
-            self.mic_mute_status_check = None
+    def setMuteSelfStatus(self):
+        self.mic_mute_status = self.getMuteSelfStatus()
 
     def startReceiveOSC(self):
         def changeHandlerMute(address, osc_arguments):
+            if config.ENABLE_TRANSCRIPTION_SEND is True:
                 if osc_arguments is True and self.mic_mute_status is False:
                     self.mic_mute_status = osc_arguments
                     self.changeMicTranscriptStatus()

src-python/models/osc/osc.py

@@ -75,7 +75,7 @@ class OSCHandler:
             self.osc_query_service.advertise_endpoint(filter, access=OSCAccess.READWRITE_VALUE)
 
     def oscServerServe(self) -> None:
-        self.osc_server.serve_forever(100)
+        self.osc_server.serve_forever(2)
 
     def oscServerStop(self) -> None:
         if isinstance(self.osc_server, osc_server.ThreadingOSCUDPServer):

src-python/webui_controller.py

@@ -1303,14 +1303,13 @@ class Controller:
     @staticmethod
     def setEnableVrcMicMuteSync(*args, **kwargs) -> dict:
         config.VRC_MIC_MUTE_SYNC = True
-        model.startCheckMuteSelfStatus()
+        model.setMuteSelfStatus()
         model.changeMicTranscriptStatus()
         return {"status":200, "result":config.VRC_MIC_MUTE_SYNC}
 
     @staticmethod
     def setDisableVrcMicMuteSync(*args, **kwargs) -> dict:
         config.VRC_MIC_MUTE_SYNC = False
-        model.stopCheckMuteSelfStatus()
         model.changeMicTranscriptStatus()
         return {"status":200, "result":config.VRC_MIC_MUTE_SYNC}
 
@@ -1725,7 +1724,7 @@ class Controller:
         printLog("Init OSC Receive")
         model.startReceiveOSC()
         if config.VRC_MIC_MUTE_SYNC is True:
-            model.startCheckMuteSelfStatus()
+            self.setEnableVrcMicMuteSync()
 
         # init Auto device selection
         device_manager.setCallbackHostList(self.updateMicHostList)