From 7350910c7b80404bd505bd8deb331c25545e9047 Mon Sep 17 00:00:00 2001
From: misyaguziya <53165965+misyaguziya@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:44:01 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20?=
 =?UTF-8?q?=E3=83=9F=E3=83=A5=E3=83=BC=E3=83=88=E5=90=8C=E6=9C=9F=E3=81=AE?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E8=A6=8B=E7=9B=B4=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-python/model.py            | 33 +++++++++------------------------
 src-python/models/osc/osc.py   |  2 +-
 src-python/webui_controller.py |  5 ++---
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src-python/model.py b/src-python/model.py
index 6dbcf10a..ec23039d 100644
--- a/src-python/model.py
+++ b/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,32 +304,18 @@ 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 osc_arguments is True and self.mic_mute_status is False:
-                self.mic_mute_status = osc_arguments
-                self.changeMicTranscriptStatus()
-            elif osc_arguments is False and self.mic_mute_status is True:
-                self.mic_mute_status = osc_arguments
-                self.changeMicTranscriptStatus()
+            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()
+                elif osc_arguments is False and self.mic_mute_status is True:
+                    self.mic_mute_status = osc_arguments
+                    self.changeMicTranscriptStatus()
 
         dict_filter_and_target = {
             self.osc_handler.osc_parameter_muteself: changeHandlerMute,
diff --git a/src-python/models/osc/osc.py b/src-python/models/osc/osc.py
index 9b021f1d..f01ce3cd 100644
--- a/src-python/models/osc/osc.py
+++ b/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):
diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py
index ff688291..c35c5743 100644
--- a/src-python/webui_controller.py
+++ b/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)