Merge branch 'connect_endpoints_run_devices' into for_webui

This commit is contained in:
Sakamoto Shiina
2024-09-26 11:29:33 +09:00
3 changed files with 24 additions and 3 deletions

View File

@@ -36,11 +36,19 @@ import { useLanguageSettings } from "@logics_main/useLanguageSettings";
import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList"; import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList";
import { useMessageInputBoxRatio } from "@logics_main/useMessageInputBoxRatio"; import { useMessageInputBoxRatio } from "@logics_main/useMessageInputBoxRatio";
import { useMicHostList } from "@logics_configs/useMicHostList";
import { useMicDeviceList } from "@logics_configs/useMicDeviceList";
import { useSpeakerDeviceList } from "@logics_configs/useSpeakerDeviceList";
const StartPythonFacadeComponent = () => { const StartPythonFacadeComponent = () => {
const { asyncStartPython } = useStartPython(); const { asyncStartPython } = useStartPython();
const hasRunRef = useRef(false); const hasRunRef = useRef(false);
const main_page = getCurrent(); const main_page = getCurrent();
const { getMicHostList } = useMicHostList();
const { getMicDeviceList } = useMicDeviceList();
const { getSpeakerDeviceList } = useSpeakerDeviceList();
const { getIsMainPageCompactMode } = useIsMainPageCompactMode(); const { getIsMainPageCompactMode } = useIsMainPageCompactMode();
const { getSoftwareVersion } = useSoftwareVersion(); const { getSoftwareVersion } = useSoftwareVersion();
const { getEnableAutoMicSelect } = useEnableAutoMicSelect(); const { getEnableAutoMicSelect } = useEnableAutoMicSelect();
@@ -84,6 +92,10 @@ const StartPythonFacadeComponent = () => {
getTranslationEngines(); getTranslationEngines();
getSelectedTranslationEngines(); getSelectedTranslationEngines();
getMicHostList();
getMicDeviceList();
getSpeakerDeviceList();
getEnableAutoMicSelect(); getEnableAutoMicSelect();
getEnableAutoSpeakerSelect(); getEnableAutoSpeakerSelect();
getSelectedMicHost(); getSelectedMicHost();

View File

@@ -85,7 +85,7 @@ const Mic_Container = () => {
selected_id={currentSelectedMicHost.data} selected_id={currentSelectedMicHost.data}
list={currentMicHostList.data} list={currentMicHostList.data}
selectFunction={selectFunction_host} selectFunction={selectFunction_host}
openListFunction={getMicHostList} // openListFunction={getMicHostList}
state={currentSelectedMicHost.state} state={currentSelectedMicHost.state}
style={{ maxWidth: "20rem", minWidth: "10rem" }} style={{ maxWidth: "20rem", minWidth: "10rem" }}
is_disabled={is_disabled_selector} is_disabled={is_disabled_selector}
@@ -99,7 +99,7 @@ const Mic_Container = () => {
selected_id={currentSelectedMicDevice.data} selected_id={currentSelectedMicDevice.data}
list={currentMicDeviceList.data} list={currentMicDeviceList.data}
selectFunction={selectFunction_device} selectFunction={selectFunction_device}
openListFunction={getMicDeviceList} // openListFunction={getMicDeviceList}
state={currentSelectedMicDevice.state} state={currentSelectedMicDevice.state}
is_disabled={is_disabled_selector} is_disabled={is_disabled_selector}
/> />
@@ -183,7 +183,7 @@ const Speaker_Container = () => {
selected_id={currentSelectedSpeakerDevice.data} selected_id={currentSelectedSpeakerDevice.data}
list={currentSpeakerDeviceList.data} list={currentSpeakerDeviceList.data}
selectFunction={selectFunction} selectFunction={selectFunction}
openListFunction={getSpeakerDeviceList} // openListFunction={getSpeakerDeviceList}
state={currentSelectedSpeakerDevice.state} state={currentSelectedSpeakerDevice.state}
is_disabled={is_disabled_selector} is_disabled={is_disabled_selector}
/> />

View File

@@ -152,6 +152,7 @@ export const useReceiveRoutes = () => {
"/set/disable/auto_speaker_select": updateEnableAutoSpeakerSelect, "/set/disable/auto_speaker_select": updateEnableAutoSpeakerSelect,
"/get/data/mic_host_list": (payload) => updateMicHostList(arrayToObject(payload)), "/get/data/mic_host_list": (payload) => updateMicHostList(arrayToObject(payload)),
"/run/mic_host_list": (payload) => updateMicHostList(arrayToObject(payload)),
"/get/data/selected_mic_host": updateSelectedMicHost, "/get/data/selected_mic_host": updateSelectedMicHost,
"/set/data/selected_mic_host": (payload) => { "/set/data/selected_mic_host": (payload) => {
updateSelectedMicHost(payload.host); updateSelectedMicHost(payload.host);
@@ -159,12 +160,20 @@ export const useReceiveRoutes = () => {
}, },
"/get/data/mic_device_list": (payload) => updateMicDeviceList(arrayToObject(payload)), "/get/data/mic_device_list": (payload) => updateMicDeviceList(arrayToObject(payload)),
"/run/mic_device_list": (payload) => updateMicDeviceList(arrayToObject(payload)),
"/get/data/selected_mic_device": updateSelectedMicDevice, "/get/data/selected_mic_device": updateSelectedMicDevice,
"/set/data/selected_mic_device": updateSelectedMicDevice, "/set/data/selected_mic_device": updateSelectedMicDevice,
"/run/selected_mic_device": (payload) => {
updateSelectedMicHost(payload.host);
updateSelectedMicDevice(payload.device);
},
"/get/data/speaker_device_list": (payload) => updateSpeakerDeviceList(arrayToObject(payload)), "/get/data/speaker_device_list": (payload) => updateSpeakerDeviceList(arrayToObject(payload)),
"/run/speaker_device_list": (payload) => updateSpeakerDeviceList(arrayToObject(payload)),
"/get/data/selected_speaker_device": updateSelectedSpeakerDevice, "/get/data/selected_speaker_device": updateSelectedSpeakerDevice,
"/set/data/selected_speaker_device": updateSelectedSpeakerDevice, "/set/data/selected_speaker_device": updateSelectedSpeakerDevice,
"/run/selected_speaker_device": updateSelectedSpeakerDevice,
"/run/check_mic_volume": updateVolumeVariable_Mic, "/run/check_mic_volume": updateVolumeVariable_Mic,
"/run/check_speaker_volume": updateVolumeVariable_Speaker, "/run/check_speaker_volume": updateVolumeVariable_Speaker,