From 80a7fd71073bb124b978b23ae724a9fa3d4a69d1 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Fri, 17 Oct 2025 11:10:39 +0900 Subject: [PATCH] =?UTF-8?q?updateSelectedMicDevice=E3=81=A7=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=83=9E=E3=82=A4=E3=82=AF=E3=81=AE=E3=83=9B=E3=82=B9?= =?UTF-8?q?=E3=83=88/=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E3=82=92=E5=88=86=E5=89=B2=E3=80=81restartAccessMicDe?= =?UTF-8?q?vices=E3=81=AE=E6=88=BB=E3=82=8A=E5=80=A4=E3=81=A8=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E3=82=92=E8=AA=BF=E6=95=B4=E3=80=81run=5Fmapping?= =?UTF-8?q?=E3=81=ABselected=5Fmic=5Fhost=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=88=E4=BD=8D=E7=BD=AE=E8=AA=BF=E6=95=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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エントリを追加(配置を調整)して通知先キーを確実に登録。 --- src-python/controller.py | 15 ++++----------- src-python/mainloop.py | 1 + 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src-python/controller.py b/src-python/controller.py index 20afc048..f70be1e1 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -140,11 +140,8 @@ class Controller: def updateSelectedMicDevice(self, host, device) -> None: config.SELECTED_MIC_HOST = host config.SELECTED_MIC_DEVICE = device - self.run( - 200, - self.run_mapping["selected_mic_device"], - {"host":host, "device":device}, - ) + self.run(200, self.run_mapping["selected_mic_host"], config.SELECTED_MIC_HOST) + self.run(200, self.run_mapping["selected_mic_device"], config.SELECTED_MIC_DEVICE) def updateSelectedSpeakerDevice(self, device) -> None: config.SELECTED_SPEAKER_DEVICE = device @@ -1135,12 +1132,8 @@ class Controller: if config.ENABLE_CHECK_ENERGY_SEND is True: self.stopThreadingCheckMicEnergy() self.startThreadingTranscriptionSendMessage() - return {"status":200, - "result":{ - "host":config.SELECTED_MIC_HOST, - "device":config.SELECTED_MIC_DEVICE, - }, - } + self.run(200, self.run_mapping["selected_mic_device"], config.SELECTED_MIC_DEVICE) + return {"status":200, "result":config.SELECTED_MIC_HOST} @staticmethod def getSelectedMicDevice(*args, **kwargs) -> dict: diff --git a/src-python/mainloop.py b/src-python/mainloop.py index 13efe44c..0ad28507 100644 --- a/src-python/mainloop.py +++ b/src-python/mainloop.py @@ -42,6 +42,7 @@ run_mapping = { "downloaded_whisper_weight":"/run/downloaded_whisper_weight", "error_whisper_weight":"/run/error_whisper_weight", + "selected_mic_host":"/run/selected_mic_host", "selected_mic_device":"/run/selected_mic_device", "selected_speaker_device":"/run/selected_speaker_device",