[Update] Config Page: Device Tab. Add Speaker device selector.
(Now, Devices (Mic host, Mic device, Speaker device) are selectable.)
This commit is contained in:
@@ -16,10 +16,11 @@ export const App = () => {
|
|||||||
const { currentIsOpenedConfigPage } = useIsOpenedConfigPage();
|
const { currentIsOpenedConfigPage } = useIsOpenedConfigPage();
|
||||||
const {
|
const {
|
||||||
getSoftwareVersion,
|
getSoftwareVersion,
|
||||||
getMicHostList,
|
// getMicHostList,
|
||||||
getSelectedMicHost,
|
getSelectedMicHost,
|
||||||
getMicDeviceList,
|
// getMicDeviceList,
|
||||||
getSelectedMicDevice,
|
getSelectedMicDevice,
|
||||||
|
getSelectedSpeakerDevice,
|
||||||
} = useConfig();
|
} = useConfig();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -27,10 +28,11 @@ export const App = () => {
|
|||||||
if (!hasRunRef.current) {
|
if (!hasRunRef.current) {
|
||||||
asyncStartPython().then((result) => {
|
asyncStartPython().then((result) => {
|
||||||
getSoftwareVersion();
|
getSoftwareVersion();
|
||||||
getMicHostList();
|
// getMicHostList();
|
||||||
getSelectedMicHost();
|
getSelectedMicHost();
|
||||||
getMicDeviceList();
|
// getMicDeviceList();
|
||||||
getSelectedMicDevice();
|
getSelectedMicDevice();
|
||||||
|
getSelectedSpeakerDevice();
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import {
|
|||||||
useSelectedMicHost,
|
useSelectedMicHost,
|
||||||
useSelectedMicDevice,
|
useSelectedMicDevice,
|
||||||
useMicDeviceList,
|
useMicDeviceList,
|
||||||
|
useSelectedSpeakerDevice,
|
||||||
|
useSpeakerDeviceList,
|
||||||
} from "@store";
|
} from "@store";
|
||||||
|
|
||||||
import { useConfig } from "@logics/useConfig";
|
import { useConfig } from "@logics/useConfig";
|
||||||
@@ -23,11 +25,16 @@ export const Device = () => {
|
|||||||
const { currentMicDeviceList } = useMicDeviceList();
|
const { currentMicDeviceList } = useMicDeviceList();
|
||||||
const { currentSelectedMicDevice } = useSelectedMicDevice();
|
const { currentSelectedMicDevice } = useSelectedMicDevice();
|
||||||
|
|
||||||
|
const { currentSpeakerDeviceList } = useSpeakerDeviceList();
|
||||||
|
const { currentSelectedSpeakerDevice } = useSelectedSpeakerDevice();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
setSelectedMicHost,
|
setSelectedMicHost,
|
||||||
setSelectedMicDevice,
|
setSelectedMicDevice,
|
||||||
getMicHostList,
|
getMicHostList,
|
||||||
getMicDeviceList,
|
getMicDeviceList,
|
||||||
|
setSelectedSpeakerDevice,
|
||||||
|
getSpeakerDeviceList,
|
||||||
} = useConfig();
|
} = useConfig();
|
||||||
|
|
||||||
const selectFunction = (selected_data) => {
|
const selectFunction = (selected_data) => {
|
||||||
@@ -40,6 +47,10 @@ export const Device = () => {
|
|||||||
setSelectedMicDevice(selected_data.selected_id);
|
setSelectedMicDevice(selected_data.selected_id);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case "speaker_device":
|
||||||
|
setSelectedSpeakerDevice(selected_data.selected_id);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -67,6 +78,16 @@ export const Device = () => {
|
|||||||
openListFunction={getMicDeviceList}
|
openListFunction={getMicDeviceList}
|
||||||
state={currentSelectedMicDevice.state}
|
state={currentSelectedMicDevice.state}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<DropdownMenuContainer
|
||||||
|
dropdown_id="speaker_device"
|
||||||
|
label={t("config_page.speaker_device.label")}
|
||||||
|
selected_id={currentSelectedSpeakerDevice.data}
|
||||||
|
list={currentSpeakerDeviceList.data}
|
||||||
|
selectFunction={selectFunction}
|
||||||
|
openListFunction={getSpeakerDeviceList}
|
||||||
|
state={currentSelectedSpeakerDevice.state}
|
||||||
|
/>
|
||||||
{/*
|
{/*
|
||||||
<ThresholdContainer label={t("config_page.mic_dynamic_energy_threshold.label_for_manual")} desc={t("config_page.mic_dynamic_energy_threshold.desc_for_manual")} id="mic_threshold" min="0" max="3000"/>
|
<ThresholdContainer label={t("config_page.mic_dynamic_energy_threshold.label_for_manual")} desc={t("config_page.mic_dynamic_energy_threshold.desc_for_manual")} id="mic_threshold" min="0" max="3000"/>
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import {
|
|||||||
useSelectedMicHost,
|
useSelectedMicHost,
|
||||||
useMicDeviceList,
|
useMicDeviceList,
|
||||||
useSelectedMicDevice,
|
useSelectedMicDevice,
|
||||||
|
useSpeakerDeviceList,
|
||||||
|
useSelectedSpeakerDevice,
|
||||||
} from "@store";
|
} from "@store";
|
||||||
|
|
||||||
import { useStdoutToPython } from "./useStdoutToPython";
|
import { useStdoutToPython } from "./useStdoutToPython";
|
||||||
@@ -18,6 +20,8 @@ export const useConfig = () => {
|
|||||||
const { updateSelectedMicHost } = useSelectedMicHost();
|
const { updateSelectedMicHost } = useSelectedMicHost();
|
||||||
const { updateMicDeviceList } = useMicDeviceList();
|
const { updateMicDeviceList } = useMicDeviceList();
|
||||||
const { updateSelectedMicDevice } = useSelectedMicDevice();
|
const { updateSelectedMicDevice } = useSelectedMicDevice();
|
||||||
|
const { updateSpeakerDeviceList } = useSpeakerDeviceList();
|
||||||
|
const { updateSelectedSpeakerDevice } = useSelectedSpeakerDevice();
|
||||||
|
|
||||||
|
|
||||||
const asyncPending = () => new Promise(() => {});
|
const asyncPending = () => new Promise(() => {});
|
||||||
@@ -66,6 +70,25 @@ export const useConfig = () => {
|
|||||||
asyncStdoutToPython("/controller/callback_set_mic_device", selected_mic_device);
|
asyncStdoutToPython("/controller/callback_set_mic_device", selected_mic_device);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
getSpeakerDeviceList: () => {
|
||||||
|
updateSpeakerDeviceList(asyncPending);
|
||||||
|
asyncStdoutToPython("/controller/list_speaker_device");
|
||||||
|
},
|
||||||
|
updateSpeakerDeviceList: (payload) => {
|
||||||
|
updateSpeakerDeviceList(arrayToObject(payload.data));
|
||||||
|
},
|
||||||
|
getSelectedSpeakerDevice: () => {
|
||||||
|
updateSelectedSpeakerDevice(asyncPending);
|
||||||
|
asyncStdoutToPython("/config/choice_speaker_device");
|
||||||
|
},
|
||||||
|
updateSelectedSpeakerDevice: (payload) => {
|
||||||
|
updateSelectedSpeakerDevice(payload.data);
|
||||||
|
},
|
||||||
|
setSelectedSpeakerDevice: (selected_speaker_device) => {
|
||||||
|
updateSelectedSpeakerDevice(asyncPending);
|
||||||
|
asyncStdoutToPython("/controller/callback_set_speaker_device", selected_speaker_device);
|
||||||
|
},
|
||||||
|
|
||||||
updateMicHostAndDevice: (payload) => {
|
updateMicHostAndDevice: (payload) => {
|
||||||
updateSelectedMicHost(payload.data.host);
|
updateSelectedMicHost(payload.data.host);
|
||||||
updateSelectedMicDevice(payload.data.device);
|
updateSelectedMicDevice(payload.data.device);
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ export const useReceiveRoutes = () => {
|
|||||||
updateMicDeviceList,
|
updateMicDeviceList,
|
||||||
updateSelectedMicDevice,
|
updateSelectedMicDevice,
|
||||||
updateMicHostAndDevice,
|
updateMicHostAndDevice,
|
||||||
|
|
||||||
|
updateSpeakerDeviceList,
|
||||||
|
updateSelectedSpeakerDevice,
|
||||||
|
|
||||||
} = useConfig();
|
} = useConfig();
|
||||||
|
|
||||||
const routes = {
|
const routes = {
|
||||||
@@ -32,14 +36,22 @@ export const useReceiveRoutes = () => {
|
|||||||
"/controller/callback_enable_transcription_receive": updateTranscriptionReceiveStatus,
|
"/controller/callback_enable_transcription_receive": updateTranscriptionReceiveStatus,
|
||||||
"/controller/callback_disable_transcription_receive": updateTranscriptionReceiveStatus,
|
"/controller/callback_disable_transcription_receive": updateTranscriptionReceiveStatus,
|
||||||
|
|
||||||
|
|
||||||
"/config/version": updateSoftwareVersion,
|
"/config/version": updateSoftwareVersion,
|
||||||
|
|
||||||
"/controller/list_mic_host": updateMicHostList,
|
"/controller/list_mic_host": updateMicHostList,
|
||||||
"/config/choice_mic_host": updateSelectedMicHost,
|
"/config/choice_mic_host": updateSelectedMicHost,
|
||||||
|
"/controller/callback_set_mic_host": updateMicHostAndDevice,
|
||||||
|
|
||||||
"/controller/list_mic_device": updateMicDeviceList,
|
"/controller/list_mic_device": updateMicDeviceList,
|
||||||
"/config/choice_mic_device": updateSelectedMicDevice,
|
"/config/choice_mic_device": updateSelectedMicDevice,
|
||||||
"/controller/callback_set_mic_host": updateMicHostAndDevice,
|
|
||||||
"/controller/callback_set_mic_device": updateSelectedMicDevice,
|
"/controller/callback_set_mic_device": updateSelectedMicDevice,
|
||||||
|
|
||||||
|
"/controller/list_speaker_device": updateSpeakerDeviceList,
|
||||||
|
"/config/choice_speaker_device": updateSelectedSpeakerDevice,
|
||||||
|
"/controller/callback_set_speaker_device": updateSelectedSpeakerDevice,
|
||||||
|
|
||||||
|
|
||||||
"/controller/callback_messagebox_send": updateSentMessageLog,
|
"/controller/callback_messagebox_send": updateSentMessageLog,
|
||||||
"/action/transcription_send_mic_message": addSentMessageLog,
|
"/action/transcription_send_mic_message": addSentMessageLog,
|
||||||
"/action/transcription_receive_speaker_message": addReceivedMessageLog
|
"/action/transcription_receive_speaker_message": addReceivedMessageLog
|
||||||
|
|||||||
@@ -121,6 +121,8 @@ export const { atomInstance: Atom_SelectedMicHost, useHook: useSelectedMicHost }
|
|||||||
export const { atomInstance: Atom_MicDeviceList, useHook: useMicDeviceList } = createAsyncAtomWithHook({}, "MicDeviceList");
|
export const { atomInstance: Atom_MicDeviceList, useHook: useMicDeviceList } = createAsyncAtomWithHook({}, "MicDeviceList");
|
||||||
export const { atomInstance: Atom_SelectedMicDevice, useHook: useSelectedMicDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicDevice");
|
export const { atomInstance: Atom_SelectedMicDevice, useHook: useSelectedMicDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicDevice");
|
||||||
|
|
||||||
|
export const { atomInstance: Atom_SpeakerDeviceList, useHook: useSpeakerDeviceList } = createAsyncAtomWithHook({}, "SpeakerDeviceList");
|
||||||
|
export const { atomInstance: Atom_SelectedSpeakerDevice, useHook: useSelectedSpeakerDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedSpeakerDevice");
|
||||||
|
|
||||||
export const { atomInstance: Atom_SendMessageFormat, useHook: useSendMessageFormat } = createAtomWithHook({
|
export const { atomInstance: Atom_SendMessageFormat, useHook: useSendMessageFormat } = createAtomWithHook({
|
||||||
before: "",
|
before: "",
|
||||||
|
|||||||
Reference in New Issue
Block a user