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

👍️[Update] Model: Auto Mic/Speaker Select ON時にDefault DeviceをUIにセットするように変更

Browse Source
This commit is contained in:
misyaguziya
2024-09-20 05:35:51 +09:00
parent ca6514b090
commit de44599827
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,11 +125,7 @@ class DeviceManager:
sleep(1) sleep(1)
enumerator.UnregisterEndpointNotificationCallback(cb) enumerator.UnregisterEndpointNotificationCallback(cb)
self.update() self.update()
self.noticeDefaultDevice()
if self.callback_default_input_device is not None:
self.callback_default_input_device(self.default_input_device["host"]["name"], self.default_input_device["device"]["name"])
if self.callback_default_output_device is not None:
self.callback_default_output_device(self.default_output_device["device"]["name"])
cb = Client() cb = Client()
enumerator = AudioUtilities.GetDeviceEnumerator() enumerator = AudioUtilities.GetDeviceEnumerator()
@@ -160,6 +156,12 @@ class DeviceManager:
def clearCallbackDefaultOutputDevice(self): def clearCallbackDefaultOutputDevice(self):
self.callback_default_output_device = None self.callback_default_output_device = None
def noticeDefaultDevice(self):
if self.callback_default_input_device is not None:
self.callback_default_input_device(self.default_input_device["host"]["name"], self.default_input_device["device"]["name"])
if self.callback_default_output_device is not None:
self.callback_default_output_device(self.default_output_device["device"]["name"])
def getInputDevices(self): def getInputDevices(self):
return self.input_devices return self.input_devices

6
src-python/webui_controller.py
View File

@@ -552,9 +552,10 @@ def getAutoMicSelect(*args, **kwargs) -> dict:
return {"status":200, "result":config.AUTO_MIC_SELECT} return {"status":200, "result":config.AUTO_MIC_SELECT}
def setEnableAutoMicSelect(data, action, *args, **kwargs) -> dict: def setEnableAutoMicSelect(data, action, *args, **kwargs) -> dict:
config.AUTO_MIC_SELECT = True
update_device = UpdateSelectedMicDevice(action) update_device = UpdateSelectedMicDevice(action)
device_manager.setCallbackDefaultInputDevice(update_device.set) device_manager.setCallbackDefaultInputDevice(update_device.set)
config.AUTO_MIC_SELECT = True device_manager.noticeDefaultDevice()
return {"status":200, "result":config.AUTO_MIC_SELECT} return {"status":200, "result":config.AUTO_MIC_SELECT}
def setDisableAutoMicSelect(*args, **kwargs) -> dict: def setDisableAutoMicSelect(*args, **kwargs) -> dict:
@@ -710,9 +711,10 @@ def getAutoSpeakerSelect(*args, **kwargs) -> dict:
return {"status":200, "result":config.AUTO_SPEAKER_SELECT} return {"status":200, "result":config.AUTO_SPEAKER_SELECT}
def setEnableAutoSpeakerSelect(data, action, *args, **kwargs) -> dict: def setEnableAutoSpeakerSelect(data, action, *args, **kwargs) -> dict:
config.AUTO_SPEAKER_SELECT = True
update_device = UpdateSelectedSpeakerDevice(action) update_device = UpdateSelectedSpeakerDevice(action)
device_manager.setCallbackDefaultOutputDevice(update_device.set) device_manager.setCallbackDefaultOutputDevice(update_device.set)
config.AUTO_SPEAKER_SELECT = True device_manager.noticeDefaultDevice()
return {"status":200, "result":config.AUTO_SPEAKER_SELECT} return {"status":200, "result":config.AUTO_SPEAKER_SELECT}
def setDisableAutoSpeakerSelect(*args, **kwargs) -> dict: def setDisableAutoSpeakerSelect(*args, **kwargs) -> dict: