👍️[Update] Model : OSCQueryServiceの起動処理を起動するまで処理するようにロールバック
This commit is contained in:
@@ -183,15 +183,6 @@ class Config:
|
|||||||
if isinstance(value, dict):
|
if isinstance(value, dict):
|
||||||
self._SELECTABLE_WHISPER_WEIGHT_TYPE_DICT = value
|
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
|
# Save Json Data
|
||||||
## Main Window
|
## Main Window
|
||||||
@property
|
@property
|
||||||
@@ -959,7 +950,6 @@ class Config:
|
|||||||
"large-v2": False,
|
"large-v2": False,
|
||||||
"large-v3": False,
|
"large-v3": False,
|
||||||
}
|
}
|
||||||
self._RECEIVE_OSC_RUNNING = False
|
|
||||||
|
|
||||||
# Save Json Data
|
# Save Json Data
|
||||||
## Main Window
|
## Main Window
|
||||||
|
|||||||
@@ -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())
|
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()
|
Thread(target=self.oscServerServe, daemon=True).start()
|
||||||
|
|
||||||
receive_osc_running = False
|
while True:
|
||||||
for _ in range(10):
|
|
||||||
try:
|
try:
|
||||||
self.osc_query_service = OSCQueryService(self.osc_query_service_name, self.http_port, self.osc_server_port)
|
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():
|
for filter, target in dict_filter_and_target.items():
|
||||||
self.osc_query_service.advertise_endpoint(filter, access=OSCAccess.READWRITE_VALUE)
|
self.osc_query_service.advertise_endpoint(filter, access=OSCAccess.READWRITE_VALUE)
|
||||||
receive_osc_running = True
|
|
||||||
break
|
break
|
||||||
except Exception:
|
except Exception:
|
||||||
sleep(1)
|
sleep(1)
|
||||||
return receive_osc_running
|
|
||||||
|
|
||||||
def oscServerServe(self) -> None:
|
def oscServerServe(self) -> None:
|
||||||
self.osc_server.serve_forever(2)
|
self.osc_server.serve_forever(2)
|
||||||
|
|||||||
@@ -1310,11 +1310,8 @@ class Controller:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def setEnableVrcMicMuteSync(*args, **kwargs) -> dict:
|
def setEnableVrcMicMuteSync(*args, **kwargs) -> dict:
|
||||||
if config.RECEIVE_OSC_RUNNING is True:
|
|
||||||
config.VRC_MIC_MUTE_SYNC = True
|
config.VRC_MIC_MUTE_SYNC = True
|
||||||
model.setMuteSelfStatus()
|
model.setMuteSelfStatus()
|
||||||
else:
|
|
||||||
config.VRC_MIC_MUTE_SYNC = False
|
|
||||||
model.changeMicTranscriptStatus()
|
model.changeMicTranscriptStatus()
|
||||||
return {"status":200, "result":config.VRC_MIC_MUTE_SYNC}
|
return {"status":200, "result":config.VRC_MIC_MUTE_SYNC}
|
||||||
|
|
||||||
@@ -1755,7 +1752,7 @@ class Controller:
|
|||||||
|
|
||||||
# init OSC receive
|
# init OSC receive
|
||||||
printLog("Init OSC Receive")
|
printLog("Init OSC Receive")
|
||||||
config.RECEIVE_OSC_RUNNING = model.startReceiveOSC()
|
model.startReceiveOSC()
|
||||||
if config.VRC_MIC_MUTE_SYNC is True:
|
if config.VRC_MIC_MUTE_SYNC is True:
|
||||||
self.setEnableVrcMicMuteSync()
|
self.setEnableVrcMicMuteSync()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user