From 347b71561fc212a1ddc90f00366b0068f980b6ce Mon Sep 17 00:00:00 2001
From: misyaguziya <53165965+misyaguziya@users.noreply.github.com>
Date: Mon, 25 Nov 2024 17:49:06 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20OSC?=
 =?UTF-8?q?QueryService=E3=81=AE=E8=B5=B7=E5=8B=95=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E8=B5=B7=E5=8B=95=E3=81=99=E3=82=8B=E3=81=BE=E3=81=A7?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83=E3=82=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-python/config.py           | 10 ----------
 src-python/models/osc/osc.py   |  5 +----
 src-python/webui_controller.py |  9 +++------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src-python/config.py b/src-python/config.py
index 313a1de6..9faf89d4 100644
--- a/src-python/config.py
+++ b/src-python/config.py
@@ -183,15 +183,6 @@ class Config:
         if isinstance(value, dict):
             self._SELECTABLE_WHISPER_WEIGHT_TYPE_DICT = value
 
-    @property
-    def RECEIVE_OSC_RUNNING(self):
-        return self._RECEIVE_OSC_RUNNING
-
-    @RECEIVE_OSC_RUNNING.setter
-    def RECEIVE_OSC_RUNNING(self, value):
-        if isinstance(value, bool):
-            self._RECEIVE_OSC_RUNNING = value
-
     # Save Json Data
     ## Main Window
     @property
@@ -959,7 +950,6 @@ class Config:
             "large-v2": False,
             "large-v3": False,
         }
-        self._RECEIVE_OSC_RUNNING = False
 
         # Save Json Data
         ## Main Window
diff --git a/src-python/models/osc/osc.py b/src-python/models/osc/osc.py
index 7862ac8f..8d076edb 100644
--- a/src-python/models/osc/osc.py
+++ b/src-python/models/osc/osc.py
@@ -70,17 +70,14 @@ class OSCHandler:
         self.osc_server = osc_server.ThreadingOSCUDPServer((self.osc_server_ip_address, self.osc_server_port), osc_dispatcher, asyncio.get_event_loop())
         Thread(target=self.oscServerServe, daemon=True).start()
 
-        receive_osc_running = False
-        for _ in range(10):
+        while True:
             try:
                 self.osc_query_service = OSCQueryService(self.osc_query_service_name, self.http_port, self.osc_server_port)
                 for filter, target in dict_filter_and_target.items():
                     self.osc_query_service.advertise_endpoint(filter, access=OSCAccess.READWRITE_VALUE)
-                receive_osc_running = True
                 break
             except Exception:
                 sleep(1)
-        return receive_osc_running
 
     def oscServerServe(self) -> None:
         self.osc_server.serve_forever(2)
diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py
index 15372740..139663e4 100644
--- a/src-python/webui_controller.py
+++ b/src-python/webui_controller.py
@@ -1310,11 +1310,8 @@ class Controller:
 
     @staticmethod
     def setEnableVrcMicMuteSync(*args, **kwargs) -> dict:
-        if config.RECEIVE_OSC_RUNNING is True:
-            config.VRC_MIC_MUTE_SYNC = True
-            model.setMuteSelfStatus()
-        else:
-            config.VRC_MIC_MUTE_SYNC = False
+        config.VRC_MIC_MUTE_SYNC = True
+        model.setMuteSelfStatus()
         model.changeMicTranscriptStatus()
         return {"status":200, "result":config.VRC_MIC_MUTE_SYNC}
 
@@ -1755,7 +1752,7 @@ class Controller:
 
         # init OSC receive
         printLog("Init OSC Receive")
-        config.RECEIVE_OSC_RUNNING = model.startReceiveOSC()
+        model.startReceiveOSC()
         if config.VRC_MIC_MUTE_SYNC is True:
             self.setEnableVrcMicMuteSync()