PublicMirrors/voice-changer
1
0
Fork 0
mirror of https://github.com/w-okada/voice-changer.git synced 2025-02-02 16:23:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor webedition flag

Browse Source
This commit is contained in:
w-okada 2023-11-23 08:10:29 +09:00
parent 3aa86f1e5a
commit 0e7c0daebc
9 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/demo/src/components/demo/components2/100_ModelSlotArea.tsx
View File

@ -3,7 +3,6 @@ import { useAppState } from "../../../001_provider/001_AppStateProvider";
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
import { useMessageBuilder } from "../../../hooks/useMessageBuilder"; import { useMessageBuilder } from "../../../hooks/useMessageBuilder";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider";
export type ModelSlotAreaProps = {}; export type ModelSlotAreaProps = {};
@ -14,8 +13,7 @@ const SortTypes = {
export type SortTypes = (typeof SortTypes)[keyof typeof SortTypes]; export type SortTypes = (typeof SortTypes)[keyof typeof SortTypes];
export const ModelSlotArea = (_props: ModelSlotAreaProps) => { export const ModelSlotArea = (_props: ModelSlotAreaProps) => {
const { serverSetting, getInfo } = useAppState(); const { serverSetting, getInfo, webEdition } = useAppState();
const { appGuiSettingState } = useAppRoot();
const guiState = useGuiState(); const guiState = useGuiState();
const messageBuilderState = useMessageBuilder(); const messageBuilderState = useMessageBuilder();
const [sortType, setSortType] = useState<SortTypes>("slot"); const [sortType, setSortType] = useState<SortTypes>("slot");
@ -118,7 +116,7 @@ export const ModelSlotArea = (_props: ModelSlotAreaProps) => {
); );
}, [modelTiles, sortType]); }, [modelTiles, sortType]);
if (appGuiSettingState.edition.indexOf("web") >= 0) { if (webEdition) {
return <></>; return <></>;
} }

6
client/demo/src/components/demo/components2/101-0_Portrait.tsx
View File

@ -1,7 +1,6 @@
import React, { useEffect, useMemo, useState } from "react"; import React, { useEffect, useMemo, useState } from "react";
import { useAppState } from "../../../001_provider/001_AppStateProvider"; import { useAppState } from "../../../001_provider/001_AppStateProvider";
import { useMessageBuilder } from "../../../hooks/useMessageBuilder"; import { useMessageBuilder } from "../../../hooks/useMessageBuilder";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider";
export type PortraitProps = {}; export type PortraitProps = {};
const BeatriceSpeakerType = { const BeatriceSpeakerType = {
male: "male", male: "male",
@ -13,8 +12,7 @@ type BeatriceSpeakerType = (typeof BeatriceSpeakerType)[keyof typeof BeatriceSpe
import MyIcon from "./female-clickable.svg"; import MyIcon from "./female-clickable.svg";
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
export const Portrait = (_props: PortraitProps) => { export const Portrait = (_props: PortraitProps) => {
const { appGuiSettingState } = useAppRoot(); const { serverSetting, volume, bufferingTime, performance, webInfoState, webEdition } = useAppState();
const { serverSetting, volume, bufferingTime, performance, webInfoState } = useAppState();
const messageBuilderState = useMessageBuilder(); const messageBuilderState = useMessageBuilder();
const [beatriceSpeakerType, setBeatriceSpeakerType] = useState<BeatriceSpeakerType>(BeatriceSpeakerType.male); const [beatriceSpeakerType, setBeatriceSpeakerType] = useState<BeatriceSpeakerType>(BeatriceSpeakerType.male);
const [beatriceSpeakerIndexInGender, setBeatriceSpeakerIndexInGender] = useState<string>(""); const [beatriceSpeakerIndexInGender, setBeatriceSpeakerIndexInGender] = useState<string>("");
@ -23,8 +21,6 @@ export const Portrait = (_props: PortraitProps) => {
const beatriceMaleSpeakersList = [1, 3, 5, 6, 9, 11, 12, 13, 20, 21, 22, 23, 28, 31, 32, 33, 34, 37, 41, 42, 44, 45, 46, 47, 48, 49, 50, 52, 54, 68, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 86, 87, 88, 89, 97, 98, 99, 100]; const beatriceMaleSpeakersList = [1, 3, 5, 6, 9, 11, 12, 13, 20, 21, 22, 23, 28, 31, 32, 33, 34, 37, 41, 42, 44, 45, 46, 47, 48, 49, 50, 52, 54, 68, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 86, 87, 88, 89, 97, 98, 99, 100];
const beatriceFemaleSpeakersList = [2, 4, 7, 8, 10, 14, 15, 16, 17, 18, 19, 24, 25, 26, 27, 29, 30, 35, 36, 38, 39, 40, 43, 51, 53, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 69, 72, 82, 83, 84, 85, 90, 91, 92, 93, 94, 95, 96]; const beatriceFemaleSpeakersList = [2, 4, 7, 8, 10, 14, 15, 16, 17, 18, 19, 24, 25, 26, 27, 29, 30, 35, 36, 38, 39, 40, 43, 51, 53, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 69, 72, 82, 83, 84, 85, 90, 91, 92, 93, 94, 95, 96];
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
useMemo(() => { useMemo(() => {
messageBuilderState.setMessage(__filename, "terms_of_use", { ja: "利用規約", en: "terms of use" }); messageBuilderState.setMessage(__filename, "terms_of_use", { ja: "利用規約", en: "terms of use" });
}, []); }, []);

5
client/demo/src/components/demo/components2/101-1_TuningArea.tsx
View File

@ -1,15 +1,12 @@
import React, { useMemo } from "react"; import React, { useMemo } from "react";
import { useAppState } from "../../../001_provider/001_AppStateProvider"; import { useAppState } from "../../../001_provider/001_AppStateProvider";
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider";
export type TuningAreaProps = {}; export type TuningAreaProps = {};
export const TuningArea = (_props: TuningAreaProps) => { export const TuningArea = (_props: TuningAreaProps) => {
const { appGuiSettingState } = useAppRoot(); const { serverSetting, webInfoState, webEdition } = useAppState();
const { serverSetting, webInfoState } = useAppState();
const { setBeatriceJVSSpeakerPitch, beatriceJVSSpeakerPitch } = useGuiState(); const { setBeatriceJVSSpeakerPitch, beatriceJVSSpeakerPitch } = useGuiState();
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
const selected = useMemo(() => { const selected = useMemo(() => {
if (webEdition) { if (webEdition) {

5
client/demo/src/components/demo/components2/101-8_web-editionSettingArea.tsx
View File

@ -1,14 +1,11 @@
import React, { useMemo } from "react"; import React, { useMemo } from "react";
import { useAppState } from "../../../001_provider/001_AppStateProvider"; import { useAppState } from "../../../001_provider/001_AppStateProvider";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider";
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
export type WebEditionSettingAreaProps = {}; export type WebEditionSettingAreaProps = {};
export const WebEditionSettingArea = (_props: WebEditionSettingAreaProps) => { export const WebEditionSettingArea = (_props: WebEditionSettingAreaProps) => {
const { serverSetting, webInfoState } = useAppState(); const { serverSetting, webInfoState, webEdition } = useAppState();
const { appGuiSettingState } = useAppRoot();
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
const guiState = useGuiState(); const guiState = useGuiState();
const selected = useMemo(() => { const selected = useMemo(() => {

3
client/demo/src/components/demo/components2/102-1_QualityArea.tsx
View File

@ -8,10 +8,9 @@ export type QualityAreaProps = {
}; };
export const QualityArea = (props: QualityAreaProps) => { export const QualityArea = (props: QualityAreaProps) => {
const { setVoiceChangerClientSetting, serverSetting, setting } = useAppState(); const { setVoiceChangerClientSetting, serverSetting, setting, webEdition } = useAppState();
const { appGuiSettingState } = useAppRoot(); const { appGuiSettingState } = useAppRoot();
const edition = appGuiSettingState.edition; const edition = appGuiSettingState.edition;
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
const qualityArea = useMemo(() => { const qualityArea = useMemo(() => {
if (!serverSetting.updateServerSettings || !setVoiceChangerClientSetting || !serverSetting.serverSetting || !setting) { if (!serverSetting.updateServerSettings || !setVoiceChangerClientSetting || !serverSetting.serverSetting || !setting) {

3
client/demo/src/components/demo/components2/102-2_ConvertArea.tsx
View File

@ -7,10 +7,9 @@ export type ConvertProps = {
}; };
export const ConvertArea = (props: ConvertProps) => { export const ConvertArea = (props: ConvertProps) => {
const { setting, serverSetting, setWorkletNodeSetting, trancateBuffer } = useAppState(); const { setting, serverSetting, setWorkletNodeSetting, trancateBuffer, webEdition } = useAppState();
const { appGuiSettingState } = useAppRoot(); const { appGuiSettingState } = useAppRoot();
const edition = appGuiSettingState.edition; const edition = appGuiSettingState.edition;
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
const convertArea = useMemo(() => { const convertArea = useMemo(() => {
let nums: number[]; let nums: number[];

6
client/demo/src/components/demo/components2/102-3_DeviceArea.tsx
View File

@ -4,12 +4,11 @@ import { fileSelectorAsDataURL, useIndexedDB } from "@dannadori/voice-changer-cl
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
import { AUDIO_ELEMENT_FOR_PLAY_MONITOR, AUDIO_ELEMENT_FOR_PLAY_RESULT, AUDIO_ELEMENT_FOR_TEST_CONVERTED, AUDIO_ELEMENT_FOR_TEST_CONVERTED_ECHOBACK, INDEXEDDB_KEY_AUDIO_MONITR, INDEXEDDB_KEY_AUDIO_OUTPUT } from "../../../const"; import { AUDIO_ELEMENT_FOR_PLAY_MONITOR, AUDIO_ELEMENT_FOR_PLAY_RESULT, AUDIO_ELEMENT_FOR_TEST_CONVERTED, AUDIO_ELEMENT_FOR_TEST_CONVERTED_ECHOBACK, INDEXEDDB_KEY_AUDIO_MONITR, INDEXEDDB_KEY_AUDIO_OUTPUT } from "../../../const";
import { isDesktopApp } from "../../../const"; import { isDesktopApp } from "../../../const";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider";
export type DeviceAreaProps = {}; export type DeviceAreaProps = {};
export const DeviceArea = (_props: DeviceAreaProps) => { export const DeviceArea = (_props: DeviceAreaProps) => {
const { setting, serverSetting, audioContext, setAudioOutputElementId, setAudioMonitorElementId, initializedRef, setVoiceChangerClientSetting, startOutputRecording, stopOutputRecording } = useAppState(); const { setting, serverSetting, audioContext, setAudioOutputElementId, setAudioMonitorElementId, initializedRef, setVoiceChangerClientSetting, startOutputRecording, stopOutputRecording, webEdition } = useAppState();
const { isConverting, audioInputForGUI, inputAudioDeviceInfo, setAudioInputForGUI, fileInputEchoback, setFileInputEchoback, setAudioOutputForGUI, setAudioMonitorForGUI, audioOutputForGUI, audioMonitorForGUI, outputAudioDeviceInfo, shareScreenEnabled, setShareScreenEnabled, reloadDeviceInfo } = useGuiState(); const { isConverting, audioInputForGUI, inputAudioDeviceInfo, setAudioInputForGUI, fileInputEchoback, setFileInputEchoback, setAudioOutputForGUI, setAudioMonitorForGUI, audioOutputForGUI, audioMonitorForGUI, outputAudioDeviceInfo, shareScreenEnabled, setShareScreenEnabled, reloadDeviceInfo } = useGuiState();
const [inputHostApi, setInputHostApi] = useState<string>("ALL"); const [inputHostApi, setInputHostApi] = useState<string>("ALL");
const [outputHostApi, setOutputHostApi] = useState<string>("ALL"); const [outputHostApi, setOutputHostApi] = useState<string>("ALL");
@ -20,9 +19,6 @@ export const DeviceArea = (_props: DeviceAreaProps) => {
const { getItem, setItem } = useIndexedDB({ clientType: null }); const { getItem, setItem } = useIndexedDB({ clientType: null });
const [outputRecordingStarted, setOutputRecordingStarted] = useState<boolean>(false); const [outputRecordingStarted, setOutputRecordingStarted] = useState<boolean>(false);
const { appGuiSettingState } = useAppRoot();
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
// (1) Audio Mode // (1) Audio Mode
const deviceModeRow = useMemo(() => { const deviceModeRow = useMemo(() => {
if (webEdition) { if (webEdition) {

5
client/demo/src/components/demo/components2/102-4_RecorderArea.tsx
View File

@ -2,16 +2,13 @@ import React, { useMemo, useState } from "react";
import { useAppState } from "../../../001_provider/001_AppStateProvider"; import { useAppState } from "../../../001_provider/001_AppStateProvider";
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
import { AUDIO_ELEMENT_FOR_SAMPLING_INPUT, AUDIO_ELEMENT_FOR_SAMPLING_OUTPUT } from "../../../const"; import { AUDIO_ELEMENT_FOR_SAMPLING_INPUT, AUDIO_ELEMENT_FOR_SAMPLING_OUTPUT } from "../../../const";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider";
export type RecorderAreaProps = {}; export type RecorderAreaProps = {};
export const RecorderArea = (_props: RecorderAreaProps) => { export const RecorderArea = (_props: RecorderAreaProps) => {
const { serverSetting } = useAppState(); const { serverSetting, webEdition } = useAppState();
const { audioOutputForAnalyzer, setAudioOutputForAnalyzer, outputAudioDeviceInfo } = useGuiState(); const { audioOutputForAnalyzer, setAudioOutputForAnalyzer, outputAudioDeviceInfo } = useGuiState();
const [serverIORecording, setServerIORecording] = useState<boolean>(false); const [serverIORecording, setServerIORecording] = useState<boolean>(false);
const { appGuiSettingState } = useAppRoot();
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
const serverIORecorderRow = useMemo(() => { const serverIORecorderRow = useMemo(() => {
if (webEdition) { if (webEdition) {

5
client/demo/src/components/demo/components2/102-5_MoreActionArea.tsx
View File

@ -1,13 +1,12 @@
import React, { useMemo } from "react"; import React, { useMemo } from "react";
import { useGuiState } from "../001_GuiStateProvider"; import { useGuiState } from "../001_GuiStateProvider";
import { useAppRoot } from "../../../001_provider/001_AppRootProvider"; import { useAppState } from "../../../001_provider/001_AppStateProvider";
export type MoreActionAreaProps = {}; export type MoreActionAreaProps = {};
export const MoreActionArea = (_props: MoreActionAreaProps) => { export const MoreActionArea = (_props: MoreActionAreaProps) => {
const { stateControls } = useGuiState(); const { stateControls } = useGuiState();
const { appGuiSettingState } = useAppRoot(); const { webEdition } = useAppState();
const webEdition = appGuiSettingState.edition.indexOf("web") >= 0;
const serverIORecorderRow = useMemo(() => { const serverIORecorderRow = useMemo(() => {
const onOpenMergeLabClicked = () => { const onOpenMergeLabClicked = () => {