ソング：プロジェクトファイル読み込みでピッチ編集データもロードする (#2021)

プロジェクトファイル読み込みでピッチ編集データもロードする

src/sing/domain.ts

@@ -325,6 +325,14 @@ export function isValidvolumeRangeAdjustment(volumeRangeAdjustment: number) {
   );
 }
 
+export function isValidPitchEditData(pitchEditData: number[]) {
+  return pitchEditData.every(
+    (value) =>
+      Number.isFinite(value) &&
+      (value > 0 || value === VALUE_INDICATING_NO_DATA),
+  );
+}
+
 export const calculateNotesHash = async (notes: Note[]) => {
   return await calculateHash({ notes });
 };

src/store/project.ts

@@ -116,6 +116,11 @@ const applySongProjectToStore = async (
       notes: tracks[0].notes,
     },
   });
+  await dispatch("CLEAR_PITCH_EDIT_DATA"); // FIXME: SET_PITCH_EDIT_DATAがセッターになれば不要
+  await dispatch("SET_PITCH_EDIT_DATA", {
+    data: tracks[0].pitchEditData,
+    startFrame: 0,
+  });
 };
 
 export const projectStore = createPartialStore<ProjectStoreTypes>({
@@ -168,6 +173,8 @@ export const projectStore = createPartialStore<ProjectStoreTypes>({
             notes: tracks[0].notes,
           },
         });
+        await context.dispatch("SET_SINGER", {});
+        await context.dispatch("CLEAR_PITCH_EDIT_DATA");
 
         context.commit("SET_PROJECT_FILEPATH", { filePath: undefined });
         context.commit("SET_SAVED_LAST_COMMAND_UNIX_MILLISEC", null);

src/store/singing.ts

@@ -61,6 +61,7 @@ import {
   decibelToLinear,
   applyPitchEdit,
   VALUE_INDICATING_NO_DATA,
+  isValidPitchEditData,
 } from "@/sing/domain";
 import {
   DEFAULT_BEATS,
@@ -535,6 +536,20 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       tempData.splice(startFrame, data.length, ...data);
       state.tracks[selectedTrackIndex].pitchEditData = tempData;
     },
+    async action(
+      { dispatch, commit },
+      { data, startFrame }: { data: number[]; startFrame: number },
+    ) {
+      if (startFrame < 0) {
+        throw new Error("startFrame must be greater than or equal to 0.");
+      }
+      if (!isValidPitchEditData(data)) {
+        throw new Error("The pitch edit data is invalid.");
+      }
+      commit("SET_PITCH_EDIT_DATA", { data, startFrame });
+
+      dispatch("RENDER");
+    },
   },
 
   ERASE_PITCH_EDIT_DATA: {
@@ -550,6 +565,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  CLEAR_PITCH_EDIT_DATA: {
+    // ピッチ編集データを失くす。
+    mutation(state) {
+      state.tracks[selectedTrackIndex].pitchEditData = [];
+    },
+    async action({ dispatch, commit }) {
+      commit("CLEAR_PITCH_EDIT_DATA");
+
+      dispatch("RENDER");
+    },
+  },
+
   SET_PHRASES: {
     mutation(state, { phrases }: { phrases: Map<string, Phrase> }) {
       state.phrases = phrases;
@@ -2698,8 +2725,8 @@ export const singingCommandStore = transformCommandStore(
         if (startFrame < 0) {
           throw new Error("startFrame must be greater than or equal to 0.");
         }
-        if (data.some((value) => !Number.isFinite(value) || value <= 0)) {
-          throw new Error("data is invalid.");
+        if (!isValidPitchEditData(data)) {
+          throw new Error("The pitch edit data is invalid.");
         }
         commit("COMMAND_SET_PITCH_EDIT_DATA", { data, startFrame });
 

src/store/type.ts

@@ -913,12 +913,18 @@ export type SingingStoreTypes = {
 
   SET_PITCH_EDIT_DATA: {
     mutation: { data: number[]; startFrame: number };
+    action(payload: { data: number[]; startFrame: number }): void;
   };
 
   ERASE_PITCH_EDIT_DATA: {
     mutation: { startFrame: number; frameLength: number };
   };
 
+  CLEAR_PITCH_EDIT_DATA: {
+    mutation: undefined;
+    action(): void;
+  };
+
   SET_PHRASES: {
     mutation: { phrases: Map<string, Phrase> };
   };