every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚧 [WIP/TEST] Deviceの自動変更に対応中

Browse Source 
検出処理を修正、たまに変化を検出しても応答しない場合がある
This commit is contained in:
misyaguziya
2024-10-03 15:50:25 +09:00
parent 92f21c32f6
commit d183c56736
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src-python/models/transcription/transcription_utils.py
View File

@@ -140,7 +140,6 @@ class DeviceManager:
self.default_speaker_device = buffer_default_speaker_device self.default_speaker_device = buffer_default_speaker_device
def checkUpdate(self): def checkUpdate(self):
printLog("checkUpdate")
if self.prev_default_mic_device["device"]["name"] != self.default_mic_device["device"]["name"]: if self.prev_default_mic_device["device"]["name"] != self.default_mic_device["device"]["name"]:
printLog("checkUpdate: default_mic_device") printLog("checkUpdate: default_mic_device")
self.update_flag_default_mic_device = True self.update_flag_default_mic_device = True
@@ -176,34 +175,26 @@ class DeviceManager:
while self.monitoring_flag is True: while self.monitoring_flag is True:
try: try:
comtypes.CoInitialize() comtypes.CoInitialize()
self.cb = Client() cb = Client()
self.enumerator = AudioUtilities.GetDeviceEnumerator() enumerator = AudioUtilities.GetDeviceEnumerator()
self.enumerator.RegisterEndpointNotificationCallback(self.cb) enumerator.RegisterEndpointNotificationCallback(cb)
while self.cb.loop is True: while cb.loop is True:
printLog("Monitoring Loop")
sleep(1) sleep(1)
self.enumerator.UnregisterEndpointNotificationCallback(self.cb) enumerator.UnregisterEndpointNotificationCallback(cb)
comtypes.CoUninitialize()
self.runProcessBeforeUpdateDevices()
sleep(2)
self.update()
self.checkUpdate()
self.noticeUpdateDevices()
self.runProcessAfterUpdateDevices()
except Exception as e: except Exception as e:
printLog("Device Monitoring: ", e) printLog("Device Monitoring: ", e)
finally: finally:
printLog("Device Monitoring Finally Init") printLog("Device Monitoring Finally Init")
comtypes.CoUninitialize()
printLog("Run Process Before Update Devices")
self.runProcessBeforeUpdateDevices()
while True:
sleep(2)
self.update()
if self.checkUpdate() is True:
break
printLog("Notice Update Devices")
self.noticeUpdateDevices()
printLog("Run Process After Update Devices")
self.runProcessAfterUpdateDevices()
except Exception as e: except Exception as e:
printLog("Device Monitoring Exception: ", e) printLog("Device Monitoring End Exception: ", e)
printLog("Device Monitoring End")
def startMonitoring(self): def startMonitoring(self):
self.monitoring_flag = True self.monitoring_flag = True

4
src-python/webui_controller.py
View File

@@ -76,9 +76,9 @@ class Controller:
def stopAccessDevices(self) -> None: def stopAccessDevices(self) -> None:
if config.ENABLE_TRANSCRIPTION_SEND is True: if config.ENABLE_TRANSCRIPTION_SEND is True:
model.stopMicTranscript() self.stopThreadingTranscriptionSendMessage()
if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
model.stopSpeakerTranscript() self.stopThreadingTranscriptionReceiveMessage()
if config.ENABLE_CHECK_ENERGY_SEND is True: if config.ENABLE_CHECK_ENERGY_SEND is True:
model.stopCheckMicEnergy() model.stopCheckMicEnergy()
if config.ENABLE_CHECK_ENERGY_RECEIVE is True: if config.ENABLE_CHECK_ENERGY_RECEIVE is True: