From cd7f4aa61416b9924b7ef03a4622b2f3e944192f Mon Sep 17 00:00:00 2001
From: misyaguziya <misyaguziya@gmail.com>
Date: Sun, 17 Sep 2023 18:47:33 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D[Update]=20OSC=E3=81=AEcheck?=
 =?UTF-8?q?=E3=81=8C=E5=AE=8C=E4=BA=86=E3=81=99=E3=82=8B=E3=81=BE=E3=81=A7?=
 =?UTF-8?q?OSC=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E7=B6=9A?=
 =?UTF-8?q?=E3=81=91=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model.py | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/model.py b/model.py
index 7a1756e0..cac44d69 100644
--- a/model.py
+++ b/model.py
@@ -80,7 +80,10 @@ class Model:
         if result:
             auth_keys = config.AUTH_KEYS
             auth_keys[choice_translator] = auth_key
-            fnc(auth_keys)
+            try:
+                fnc(auth_keys)
+            except:
+                pass
         return result
 
     def startLogger(self):
@@ -180,8 +183,15 @@ class Model:
     @staticmethod
     def checkOSCStarted(fnc):
         def checkOscReceive(address, osc_arguments):
-            if config.IS_VALID_OSC is False:
-                fnc(True)
+            if config.IS_VALID_OSC is False and config.STARTUP_OSC_ENABLED_CHECK is True:
+                try:
+                    fnc(True)
+                except:
+                    pass
+
+        def sendTestActionLoop():
+            while config.IS_VALID_OSC is False and config.STARTUP_OSC_ENABLED_CHECK is True:
+                sendTestAction()
 
         # start receive osc
         th_receive_osc_parameters = Thread(target=receiveOscParameters, args=(checkOscReceive,))
@@ -189,7 +199,9 @@ class Model:
         th_receive_osc_parameters.start()
 
         # check osc started
-        sendTestAction()
+        th_send_osc_test_action = Thread(target=sendTestActionLoop)
+        th_send_osc_test_action.daemon = True
+        th_send_osc_test_action.start()
 
     @staticmethod
     def checkSoftwareUpdated(fnc):
@@ -197,7 +209,10 @@ class Model:
         response = requests_get(config.GITHUB_URL)
         tag_name = response.json()["tag_name"]
         if tag_name != config.VERSION:
-            fnc(True)
+            try:
+                fnc(True)
+            except:
+                pass
 
     @staticmethod
     def getListInputHost():
@@ -270,7 +285,7 @@ class Model:
                     fnc(energy)
                 except:
                     pass
-            sleep(0.01)
+            # sleep(0.01)
 
         mic_energy_queue = Queue()
         mic_device = [device for device in getInputDevices()[config.CHOICE_MIC_HOST] if device["name"] == config.CHOICE_MIC_DEVICE][0]
@@ -336,7 +351,7 @@ class Model:
                     fnc(energy)
                 except:
                     pass
-            sleep(0.01)
+            # sleep(0.01)
 
         speaker_device = [device for device in getOutputDevices() if device["name"] == config.CHOICE_SPEAKER_DEVICE][0]
         speaker_energy_queue = Queue()