updateSelectedMicDeviceで選択マイクのホスト/デバイス通知を分割、restartAccessMicDevicesの戻り値と通知を調整、run_mappingにselected_mic_hostを追加(位置調整)

- Controller.updateSelectedMicDevice: これまで単一のペイロードで送っていた{"host", "device"}をやめ、selected_mic_hostとselected_mic_deviceを個別にrunで通知するように変更。
- Controller.restartAccessMicDevices: selected_mic_deviceのrun通知を追加し、戻り値をデバイス情報の辞書からSELECTED_MIC_HOSTに変更。
- mainloop.run_mapping: selected_mic_hostエントリを追加(配置を調整)して通知先キーを確実に登録。
This commit is contained in:
misyaguziya
2025-10-17 11:10:39 +09:00
parent b0403cfa70
commit 80a7fd7107
2 changed files with 5 additions and 11 deletions

View File

@@ -140,11 +140,8 @@ class Controller:
def updateSelectedMicDevice(self, host, device) -> None: def updateSelectedMicDevice(self, host, device) -> None:
config.SELECTED_MIC_HOST = host config.SELECTED_MIC_HOST = host
config.SELECTED_MIC_DEVICE = device config.SELECTED_MIC_DEVICE = device
self.run( self.run(200, self.run_mapping["selected_mic_host"], config.SELECTED_MIC_HOST)
200, self.run(200, self.run_mapping["selected_mic_device"], config.SELECTED_MIC_DEVICE)
self.run_mapping["selected_mic_device"],
{"host":host, "device":device},
)
def updateSelectedSpeakerDevice(self, device) -> None: def updateSelectedSpeakerDevice(self, device) -> None:
config.SELECTED_SPEAKER_DEVICE = device config.SELECTED_SPEAKER_DEVICE = device
@@ -1135,12 +1132,8 @@ class Controller:
if config.ENABLE_CHECK_ENERGY_SEND is True: if config.ENABLE_CHECK_ENERGY_SEND is True:
self.stopThreadingCheckMicEnergy() self.stopThreadingCheckMicEnergy()
self.startThreadingTranscriptionSendMessage() self.startThreadingTranscriptionSendMessage()
return {"status":200, self.run(200, self.run_mapping["selected_mic_device"], config.SELECTED_MIC_DEVICE)
"result":{ return {"status":200, "result":config.SELECTED_MIC_HOST}
"host":config.SELECTED_MIC_HOST,
"device":config.SELECTED_MIC_DEVICE,
},
}
@staticmethod @staticmethod
def getSelectedMicDevice(*args, **kwargs) -> dict: def getSelectedMicDevice(*args, **kwargs) -> dict:

View File

@@ -42,6 +42,7 @@ run_mapping = {
"downloaded_whisper_weight":"/run/downloaded_whisper_weight", "downloaded_whisper_weight":"/run/downloaded_whisper_weight",
"error_whisper_weight":"/run/error_whisper_weight", "error_whisper_weight":"/run/error_whisper_weight",
"selected_mic_host":"/run/selected_mic_host",
"selected_mic_device":"/run/selected_mic_device", "selected_mic_device":"/run/selected_mic_device",
"selected_speaker_device":"/run/selected_speaker_device", "selected_speaker_device":"/run/selected_speaker_device",