タイミング再調整

X-20A · Nov 24, 2024 · ded8c10 · ded8c10
1 parent 1f1e902
commit ded8c10
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 43 deletions.
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -31,6 +31,7 @@ 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";
@@ -97,6 +98,13 @@ watchEffect(() => {
   setThemeToCss(theme);
 });
 
+// 再生デバイスの初期化と変更の監視
+watchEffect(() => {
+  applyDeviceId(store.state.savingSetting.audioOutputDevice).catch((e) => {
+    console.error(e);
+  });
+});
+
 // ソフトウェアを初期化
 const { hotkeyManager } = useHotkeyManager();
 const isEnginesReady = ref(false);

diff --git a/src/sing/audioRendering.ts b/src/sing/audioRendering.ts
@@ -4,7 +4,6 @@ import {
   linearToDecibel,
 } from "@/sing/domain";
 import { Timer } from "@/sing/utility";
-import { showAlertDialog } from "@/components/Dialog/Dialog";
 
 const getEarliestSchedulableContextTime = (audioContext: BaseAudioContext) => {
   const renderQuantumSize = 128;
@@ -94,21 +93,6 @@ export class Transport {
       this._time = value;
     }
   }
-  set sinkId(device: string) {
-    device = device ? device : "";
-    if (this.audioContext.setSinkId) {
-      this.audioContext
-        .setSinkId(device === "default" ? "" : device)
-        .catch((err: unknown) => {
-          void showAlertDialog({
-            type: "error",
-            title: "エラー",
-            message: "再生デバイスが見つかりません",
-          });
-          throw err;
-        });
-    }
-  }
 
   /**
    * @param audioContext 音声コンテキスト
@@ -782,7 +766,7 @@ export type PolySynthOptions = {
  * ポリフォニックシンセサイザーです。
  */
 export class PolySynth implements Instrument {
-  private readonly audioContext: AudioContext;
+  private readonly audioContext: BaseAudioContext;
   private readonly gainNode: GainNode;
   private readonly oscParams: SynthOscParams;
   private readonly filterParams: SynthFilterParams;
@@ -793,23 +777,8 @@ export class PolySynth implements Instrument {
   get output(): AudioNode {
     return this.gainNode;
   }
-  set sinkId(device: string) {
-    device = device ? device : "";
-    if (this.audioContext.setSinkId) {
-      this.audioContext
-        .setSinkId(device === "default" ? "" : device)
-        .catch((err: unknown) => {
-          void showAlertDialog({
-            type: "error",
-            title: "エラー",
-            message: "再生デバイスが見つかりません",
-          });
-          throw err;
-        });
-    }
-  }
 
-  constructor(audioContext: AudioContext, options?: PolySynthOptions) {
+  constructor(audioContext: BaseAudioContext, options?: PolySynthOptions) {
     this.audioContext = audioContext;
     this.oscParams = options?.osc ?? {
       type: "square",

diff --git a/src/store/singing.ts b/src/store/singing.ts
@@ -106,6 +106,7 @@ import { uuid4 } from "@/helpers/random";
 import { convertToWavFileData } from "@/sing/convertToWavFileData";
 import { generateWriteErrorMessage } from "@/helpers/fileHelper";
 import path from "@/helpers/path";
+import { showAlertDialog } from "@/components/Dialog/Dialog";
 
 const logger = createLogger("store/singing");
 
@@ -753,10 +754,18 @@ const getSelectedTrackWithFallback = (partialState: {
   return getOrThrow(partialState.tracks, partialState._selectedTrackId);
 };
 
-const applyDeviceId = (device: string) => {
-  if (transport && previewSynth) {
-    transport.sinkId = device;
-    previewSynth.sinkId = device;
+// AudioContextに再生デバイスのIDを設定
+export const applyDeviceId = async (device: string) => {
+  if (audioContext) {
+    const sinkId = device === "default" ? "" : device;
+    audioContext.setSinkId(sinkId).catch((err: unknown) => {
+      void showAlertDialog({
+        type: "error",
+        title: "エラー",
+        message: "再生デバイスが見つかりません",
+      });
+      throw err;
+    });
   }
 };
 
@@ -1464,11 +1473,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   },
 
   SET_PLAYHEAD_POSITION: {
-    async action({ state, getters }, { position }: { position: number }) {
+    async action({ getters }, { position }: { position: number }) {
       if (!transport) {
         throw new Error("transport is undefined.");
       }
-      applyDeviceId(state.savingSetting.audioOutputDevice);
       playheadPosition.value = position;
       transport.time = getters.TICK_TO_SECOND(position);
     },
@@ -1490,8 +1498,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       }
       mutations.SET_PLAYBACK_STATE({ nowPlaying: true });
 
-      applyDeviceId(state.savingSetting.audioOutputDevice);
-
       transport.start();
       animationTimer.start(() => {
         playheadPosition.value = getters.SECOND_TO_TICK(transport.time);
@@ -1531,7 +1537,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   PLAY_PREVIEW_SOUND: {
     async action(
-      { state },
+      _,
       { noteNumber, duration }: { noteNumber: number; duration?: number },
     ) {
       if (!audioContext) {
@@ -1540,7 +1546,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (!previewSynth) {
         throw new Error("previewSynth is undefined.");
       }
-      applyDeviceId(state.savingSetting.audioOutputDevice);
       previewSynth.noteOn("immediately", noteNumber, duration);
     },
   },