vuexを経由するように

X-20A · Nov 25, 2024 · e6a8f62 · e6a8f62
1 parent ded8c10
commit e6a8f62
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -31,7 +31,6 @@ import SingEditor from "@/components/Sing/SingEditor.vue";
 import { EngineId } from "@/type/preload";
 import ErrorBoundary from "@/components/ErrorBoundary.vue";
 import { useStore } from "@/store";
-import { applyDeviceId } from "@/store/singing";
 import { useHotkeyManager } from "@/plugins/hotkeyPlugin";
 import AllDialog from "@/components/Dialog/AllDialog.vue";
 import MenuBar from "@/components/Menu/MenuBar/MenuBar.vue";
@@ -100,9 +99,11 @@ watchEffect(() => {
 
 // 再生デバイスの初期化と変更の監視
 watchEffect(() => {
-  applyDeviceId(store.state.savingSetting.audioOutputDevice).catch((e) => {
-    console.error(e);
-  });
+  store.actions
+    .APPLY_DEVICE_ID({ device: store.state.savingSetting.audioOutputDevice })
+    .catch((e) => {
+      console.error(e);
+    });
 });
 
 // ソフトウェアを初期化

diff --git a/src/store/singing.ts b/src/store/singing.ts
@@ -755,7 +755,7 @@ const getSelectedTrackWithFallback = (partialState: {
 };
 
 // AudioContextに再生デバイスのIDを設定
-export const applyDeviceId = async (device: string) => {
+const applyDeviceId = async (device: string) => {
   if (audioContext) {
     const sinkId = device === "default" ? "" : device;
     audioContext.setSinkId(sinkId).catch((err: unknown) => {
@@ -1698,6 +1698,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  APPLY_DEVICE_ID: {
+    async action(_, { device }) {
+      await applyDeviceId(device);
+    },
+  },
+
   /**
    * レンダリングを行う。レンダリング中だった場合は停止して再レンダリングする。
    */

diff --git a/src/store/type.ts b/src/store/type.ts
@@ -1326,6 +1326,10 @@ export type SingingStoreTypes = {
   SYNC_TRACKS_AND_TRACK_CHANNEL_STRIPS: {
     action(): void;
   };
+
+  APPLY_DEVICE_ID: {
+    action(payload: { device: string }): void;
+  };
 };
 
 export type SingingCommandStoreState = {