マルチトラック：storeを色々変える

src/sing/domain.ts

@@ -89,6 +89,14 @@ export const isValidNotes = (notes: Note[]) => {
  return notes.every((value) => isValidNote(value));
 };
 
+export const isValidTrack = (track: Track) => {
+ return (
+ Number.isInteger(track.keyRangeAdjustment) &&
+ Number.isInteger(track.volumeRangeAdjustment) &&
+ isValidNotes(track.notes)
+ );
+};
+
 const tickToSecondForConstantBpm = (
  ticks: number,
  bpm: number,

src/store/singing.ts

@@ -69,6 +69,7 @@ import {
  createDefaultTempo,
  createDefaultTimeSignature,
  isValidNotes,
+ isValidTrack,
 } from "@/sing/domain";
 import {
  FrequentlyUpdatedState,
@@ -924,16 +925,27 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
  state.overlappingNoteInfos.set(trackId, new Map());
  state.overlappingNoteIds.set(trackId, new Set());
  },
- action({ commit }, { trackId, track }) {
+ action({ state, commit, dispatch }, { trackId, track }) {
+ if (state.trackOrder.includes(trackId)) {
+ throw new Error(`Track ${trackId} is already registered.`);
+ }
+ if (!isValidTrack(track)) {
+ throw new Error("The track is invalid.");
+ }
  commit("REGISTER_TRACK", { trackId, track });
+
+ dispatch("RENDER");
  },
  },
 
  SELECT_TRACK: {
  mutation(state, { trackId }) {
  state.selectedTrackId = trackId;
  },
- action({ commit }, { trackId }) {
+ action({ state, commit }, { trackId }) {
+ if (!state.tracks.has(trackId)) {
+ throw new Error(`Track ${trackId} does not exist.`);
+ }
  commit("SELECT_TRACK", { trackId });
  },
  },
@@ -977,15 +989,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
  },
  },
 
- SET_TRACK_ORDER: {
- mutation(state, { trackOrder }) {
- state.trackOrder = trackOrder;
- },
- action({ commit }, { trackOrder }) {
- commit("SET_TRACK_ORDER", { trackOrder });
- },
- },
-
  /**
  * レンダリングを行う。レンダリング中だった場合は停止して再レンダリングする。
  */
@@ -1328,12 +1331,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
  const audioContextRef = audioContext;
  const transportRef = transport;
  const channelStripRef = channelStrip;
+
+ // レンダリング中に変更される可能性のあるデータをコピーする
  const tracks = structuredClone(toRaw(state.tracks));
 
- const singerAndFrameRates = new Map<
- TrackId,
- { singer: Singer; frameRate: number } | undefined
- >(
+ const singerAndFrameRates = new Map(
  [...tracks].map(([trackId, track]) => [
  trackId,
  track.singer
@@ -1345,11 +1347,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
  : undefined,
  ]),
  );
-
- // レンダリング中に変更される可能性のあるデータをコピーする
  const tpqn = state.tpqn;
  const tempos = state.tempos.map((value) => ({ ...value }));
  const editFrameRate = state.editFrameRate;
+
  const firstRestMinDurationSeconds = 0.12;
  const lastRestDurationSeconds = 0.5;
  const fadeOutDurationSeconds = 0.15;

src/store/type.ts

@@ -1168,11 +1168,6 @@ export type SingingStoreTypes = {
  mutation: { tracks: Map<TrackId, Track> };
  action(payload: { tracks: Map<TrackId, Track> }): Promise<void>;
  };
-
- SET_TRACK_ORDER: {
- mutation: { trackOrder: TrackId[] };
- action(payload: { trackOrder: TrackId[] }): void;
- };
 };
 
 export type SingingCommandStoreState = {