From 645ab4b5c7612f3adf9e3eaf9d22e92d07a81fad Mon Sep 17 00:00:00 2001 From: Sig Date: Fri, 20 Oct 2023 04:25:29 +0900 Subject: [PATCH] =?UTF-8?q?[project-s]=20=E3=82=A4=E3=83=B3=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=88=E5=91=A8=E3=82=8A=E3=81=AE=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=81=A8=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=B0=20(#1614)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sing/ScoreSequencer.vue | 21 +- src/components/Sing/SequencerNote.vue | 4 +- src/components/Sing/ToolBar.vue | 2 +- src/infrastructures/AudioRenderer.ts | 42 +-- src/store/singing.ts | 443 ++++++++++++++----------- src/store/type.ts | 52 +-- 6 files changed, 315 insertions(+), 249 deletions(-) diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue index 0d3f03afb1..2224b4b15d 100644 --- a/src/components/Sing/ScoreSequencer.vue +++ b/src/components/Sing/ScoreSequencer.vue @@ -172,7 +172,7 @@ export default defineComponent({ const dragMoveCurrentY = ref(); const dragDurationCurrentX = ref(); // 分解能（Ticks Per Quarter Note） - const tpqn = computed(() => state.score?.resolution ?? 480); + const tpqn = computed(() => state.score?.tpqn ?? 480); // ノート const notes = computed(() => state.score?.notes ?? []); // 拍子 @@ -263,7 +263,7 @@ export default defineComponent({ note: { id, position, - midi: noteNumber, + noteNumber, duration, lyric, }, @@ -337,10 +337,10 @@ export default defineComponent({ } isNotesChanged = true; const position = note.position + amountPositionX; - const noteNumber = note.midi + amountPositionY; + const noteNumber = note.noteNumber + amountPositionY; return { ...note, - midi: noteNumber, + noteNumber, position, }; } else { @@ -506,16 +506,16 @@ export default defineComponent({ } const newNotes = state.score.notes.map((note) => { if (selectedNoteIds.value.includes(note.id)) { - const noteNumber = Math.min(note.midi + 1, 127); + const noteNumber = Math.min(note.noteNumber + 1, 127); return { ...note, - midi: noteNumber, + noteNumber, }; } else { return note; } }); - if (newNotes.some((note) => note.midi > 127)) { + if (newNotes.some((note) => note.noteNumber > 127)) { return; } store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes }); @@ -527,16 +527,16 @@ export default defineComponent({ } const newNotes = state.score.notes.map((note) => { if (selectedNoteIds.value.includes(note.id)) { - const noteNumber = Math.max(note.midi - 1, 0); + const noteNumber = Math.max(note.noteNumber - 1, 0); return { ...note, - midi: noteNumber, + noteNumber, }; } else { return note; } }); - if (newNotes.some((note) => note.midi < 0)) { + if (newNotes.some((note) => note.noteNumber < 0)) { return; } store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes }); @@ -622,7 +622,6 @@ export default defineComponent({ }); return { - measureNum, beatsPerMeasure, beatWidth, gridCellWidth, diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue index b0c9246849..9834ded9e2 100644 --- a/src/components/Sing/SequencerNote.vue +++ b/src/components/Sing/SequencerNote.vue @@ -84,7 +84,7 @@ export default defineComponent({ setup(props, { emit }) { const store = useStore(); const state = store.state; - const tpqn = computed(() => state.score?.resolution ?? 480); + const tpqn = computed(() => state.score?.tpqn ?? 480); const zoomX = computed(() => state.sequencerZoomX); const zoomY = computed(() => state.sequencerZoomY); const positionX = computed(() => { @@ -92,7 +92,7 @@ export default defineComponent({ return tickToBaseX(noteStartTicks, tpqn.value) * zoomX.value; }); const positionY = computed(() => { - const noteNumber = props.note.midi; + const noteNumber = props.note.noteNumber; return noteNumberToBaseY(noteNumber + 0.5) * zoomY.value; }); const barHeight = computed(() => getKeyBaseHeight() * zoomY.value); diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue index d70d571d6b..7931008c28 100644 --- a/src/components/Sing/ToolBar.vue +++ b/src/components/Sing/ToolBar.vue @@ -249,7 +249,7 @@ export default defineComponent({ }); const snapTypeSelectOptions = computed(() => { - const tpqn = store.state.score?.resolution ?? 480; + const tpqn = store.state.score?.tpqn ?? 480; return getSnapTypes(tpqn).map((snapType) => { if (isTriplet(snapType)) { return { snapType, label: `1/${(snapType / 3) * 2}（三連符）` }; diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts index eeb5f07c8b..26076fd250 100644 --- a/src/infrastructures/AudioRenderer.ts +++ b/src/infrastructures/AudioRenderer.ts @@ -411,17 +411,17 @@ export interface Instrument { * ノートオンをスケジュールします。 * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。 * @param contextTime ノートオンを行う時刻（コンテキスト時間） - * @param midi MIDIノート番号 + * @param noteNumber MIDIノート番号 */ - noteOn(contextTime: number, midi: number): void; + noteOn(contextTime: number, noteNumber: number): void; /** * ノートオフをスケジュールします。 * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。 * @param contextTime ノートオフを行う時刻（コンテキスト時間） - * @param midi MIDIノート番号 + * @param noteNumber MIDIノート番号 */ - noteOff(contextTime: number, midi: number): void; + noteOff(contextTime: number, noteNumber: number): void; /** * 発音中のすべての音に対して、ノートオフのスケジュールを行います。 @@ -436,7 +436,7 @@ export interface Instrument { export type NoteEvent = { readonly noteOnTime: number; readonly noteOffTime: number; - readonly midi: number; + readonly noteNumber: number; }; /** @@ -502,8 +502,8 @@ class NoteEventScheduler implements EventScheduler { this.startContextTime + (event.noteOffTime - this.startTime); if (event.noteOnTime < untilTime) { - this.instrument.noteOn(noteOnContextTime, event.midi); - this.instrument.noteOff(noteOffContextTime, event.midi); + this.instrument.noteOn(noteOnContextTime, event.noteNumber); + this.instrument.noteOff(noteOffContextTime, event.noteNumber); this.index++; } else break; } @@ -647,7 +647,7 @@ export type Envelope = { }; type SynthVoiceParams = { - readonly midi: number; + readonly noteNumber: number; readonly oscillatorType: OscillatorType; readonly envelope: Envelope; }; @@ -656,7 +656,7 @@ type SynthVoiceParams = { * シンセサイザーのボイスです。音を合成します。 */ class SynthVoice { - readonly midi: number; + readonly noteNumber: number; private readonly oscillatorNode: OscillatorNode; private readonly gainNode: GainNode; private readonly envelope: Envelope; @@ -678,7 +678,7 @@ class SynthVoice { } constructor(audioContext: BaseAudioContext, params: SynthVoiceParams) { - this.midi = params.midi; + this.noteNumber = params.noteNumber; this.envelope = params.envelope; this.oscillatorNode = new OscillatorNode(audioContext); @@ -692,11 +692,11 @@ class SynthVoice { /** * MIDIノート番号を周波数に変換します。 - * @param midi MIDIノート番号 + * @param noteNumber MIDIノート番号 * @returns 周波数（Hz） */ - private midiToFrequency(midi: number) { - return 440 * 2 ** ((midi - 69) / 12); + private midiToFrequency(noteNumber: number) { + return 440 * 2 ** ((noteNumber - 69) / 12); } /** @@ -715,7 +715,7 @@ class SynthVoice { this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk); this.gainNode.gain.setTargetAtTime(sus, t0 + atk, dcy); - const freq = this.midiToFrequency(this.midi); + const freq = this.midiToFrequency(this.noteNumber); this.oscillatorNode.frequency.value = freq; this.oscillatorNode.start(contextTime); @@ -797,16 +797,16 @@ export class PolySynth implements Instrument { * ノートオンをスケジュールします。 * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。 * @param contextTime ノートオンを行う時刻（コンテキスト時間） - * @param midi MIDIノート番号 + * @param noteNumber MIDIノート番号 */ - noteOn(contextTime: number, midi: number) { + noteOn(contextTime: number, noteNumber: number) { const exists = this.voices.some((value) => { - return value.isActive && value.midi === midi; + return value.isActive && value.noteNumber === noteNumber; }); if (exists) return; const voice = new SynthVoice(this.audioContext, { - midi, + noteNumber, oscillatorType: this.oscillatorType, envelope: this.envelope, }); @@ -822,11 +822,11 @@ export class PolySynth implements Instrument { * ノートオフをスケジュールします。 * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。 * @param contextTime ノートオフを行う時刻（コンテキスト時間） - * @param midi MIDIノート番号 + * @param noteNumber MIDIノート番号 */ - noteOff(contextTime: number, midi: number) { + noteOff(contextTime: number, noteNumber: number) { const voice = this.voices.find((value) => { - return value.isActive && value.midi === midi; + return value.isActive && value.noteNumber === noteNumber; }); if (!voice) return; diff --git a/src/store/singing.ts b/src/store/singing.ts index 3dd1e5c2b9..17fbed0c55 100644 --- a/src/store/singing.ts +++ b/src/store/singing.ts @@ -37,27 +37,25 @@ import { import { AudioQuery, Mora } from "@/openapi"; import { ResultError, getValueOrThrow } from "@/type/result"; -const ticksToSecondsForConstantBpm = ( - resolution: number, - bpm: number, - ticks: number +const tickToSecondForConstantTempo = ( + ticks: number, + tempo: number, + tpqn: number ) => { - const ticksPerBeat = resolution; - const beatsPerSecond = bpm / 60; - return ticks / ticksPerBeat / beatsPerSecond; + const quarterNotesPerSecond = tempo / 60; + return ticks / tpqn / quarterNotesPerSecond; }; -const secondsToTickForConstantBpm = ( - resolution: number, - bpm: number, - seconds: number +const secondToTickForConstantTempo = ( + seconds: number, + tempo: number, + tpqn: number ) => { - const ticksPerBeat = resolution; - const beatsPerSecond = bpm / 60; - return seconds * beatsPerSecond * ticksPerBeat; + const quarterNotesPerSecond = tempo / 60; + return seconds * quarterNotesPerSecond * tpqn; }; -const ticksToSeconds = (resolution: number, tempos: Tempo[], ticks: number) => { +const tickToSecond = (ticks: number, tempos: Tempo[], tpqn: number) => { let timeOfTempo = 0; let tempo = tempos[tempos.length - 1]; for (let i = 0; i < tempos.length; i++) { @@ -68,27 +66,19 @@ const ticksToSeconds = (resolution: number, tempos: Tempo[], ticks: number) => { tempo = tempos[i]; break; } - timeOfTempo += ticksToSecondsForConstantBpm( - resolution, + timeOfTempo += tickToSecondForConstantTempo( + tempos[i + 1].position - tempos[i].position, tempos[i].tempo, - tempos[i + 1].position - tempos[i].position + tpqn ); } return ( timeOfTempo + - ticksToSecondsForConstantBpm( - resolution, - tempo.tempo, - ticks - tempo.position - ) + tickToSecondForConstantTempo(ticks - tempo.position, tempo.tempo, tpqn) ); }; -const secondsToTicks = ( - resolution: number, - tempos: Tempo[], - seconds: number -) => { +const secondToTick = (seconds: number, tempos: Tempo[], tpqn: number) => { let timeOfTempo = 0; let tempo = tempos[tempos.length - 1]; for (let i = 0; i < tempos.length; i++) { @@ -97,10 +87,10 @@ const secondsToTicks = ( } const timeOfNextTempo = timeOfTempo + - ticksToSecondsForConstantBpm( - resolution, + tickToSecondForConstantTempo( + tempos[i + 1].position - tempos[i].position, tempos[i].tempo, - tempos[i + 1].position - tempos[i].position + tpqn ); if (timeOfNextTempo > seconds) { tempo = tempos[i]; @@ -110,7 +100,7 @@ const secondsToTicks = ( } return ( tempo.position + - secondsToTickForConstantBpm(resolution, tempo.tempo, seconds - timeOfTempo) + secondToTickForConstantTempo(seconds - timeOfTempo, tempo.tempo, tpqn) ); }; @@ -124,25 +114,21 @@ const generateAudioEvents = async ( return [{ time, buffer }]; }; -const generateNoteEvents = ( - resolution: number, - tempos: Tempo[], - notes: Note[] -) => { +const generateNoteEvents = (notes: Note[], tempos: Tempo[], tpqn: number) => { return notes.map((value): NoteEvent => { const noteOnPos = value.position; const noteOffPos = value.position + value.duration; return { - midi: value.midi, - noteOnTime: ticksToSeconds(resolution, tempos, noteOnPos), - noteOffTime: ticksToSeconds(resolution, tempos, noteOffPos), + noteNumber: value.noteNumber, + noteOnTime: tickToSecond(noteOnPos, tempos, tpqn), + noteOffTime: tickToSecond(noteOffPos, tempos, tpqn), }; }); }; const copyScore = (score: Score): Score => { return { - resolution: score.resolution, + tpqn: score.tpqn, tempos: score.tempos.map((value) => ({ ...value })), timeSignatures: score.timeSignatures.map((value) => ({ ...value })), notes: score.notes.map((value) => ({ ...value })), @@ -225,11 +211,11 @@ const isValidNote = (note: Note) => { return ( Number.isInteger(note.position) && Number.isInteger(note.duration) && - Number.isInteger(note.midi) && + Number.isInteger(note.noteNumber) && note.position >= 0 && note.duration > 0 && - note.midi >= 0 && - note.midi <= 127 + note.noteNumber >= 0 && + note.noteNumber <= 127 ); }; @@ -240,7 +226,7 @@ const getFromOptional = (value: T | undefined): T => { return value; }; -const DEFAULT_RESOLUTION = 480; +const DEFAULT_TPQN = 480; const DEFAULT_TEMPO = 120; const DEFAULT_BEATS = 4; const DEFAULT_BEAT_TYPE = 4; @@ -351,8 +337,8 @@ export const singingStore = createPartialStore({ GET_EMPTY_SCORE: { async action() { - const score = { - resolution: DEFAULT_RESOLUTION, + const score: Score = { + tpqn: DEFAULT_TPQN, tempos: [{ position: 0, tempo: DEFAULT_TEMPO }], timeSignatures: [ { position: 0, beats: DEFAULT_BEATS, beatType: DEFAULT_BEAT_TYPE }, @@ -679,7 +665,7 @@ export const singingStore = createPartialStore({ state.sequencerSnapType = snapType; }, async action({ state, commit }, { snapType }) { - const tpqn = state.score?.resolution ?? 480; + const tpqn = state.score?.tpqn ?? 480; if (!isValidSnapType(snapType, tpqn)) { throw new Error("The snap type is invalid."); } @@ -733,13 +719,13 @@ export const singingStore = createPartialStore({ POSITION_TO_TIME: { getter: (state) => (position) => { const score = getFromOptional(state.score); - return ticksToSeconds(score.resolution, score.tempos, position); + return tickToSecond(position, score.tempos, score.tpqn); }, }, TIME_TO_POSITION: { getter: (state) => (time) => { const score = getFromOptional(state.score); - return secondsToTicks(score.resolution, score.tempos, time); + return secondToTick(time, score.tempos, score.tpqn); }, }, GET_PLAYBACK_POSITION: { @@ -976,15 +962,15 @@ export const singingStore = createPartialStore({ const mora = moras[j]; const note = score.notes[noteIndex]; - const noteOnTime = ticksToSeconds( - score.resolution, + const noteOnTime = tickToSecond( + note.position, score.tempos, - note.position + score.tpqn ); - const noteOffTime = ticksToSeconds( - score.resolution, + const noteOffTime = tickToSecond( + note.position + note.duration, score.tempos, - note.position + note.duration + score.tpqn ); // 長さを編集 @@ -1020,7 +1006,7 @@ export const singingStore = createPartialStore({ } // 音高を編集 - const freq = noteNumberToFrequency(note.midi); + const freq = noteNumberToFrequency(note.noteNumber); mora.pitch = Math.log(freq); // 無声化を解除 @@ -1047,10 +1033,10 @@ export const singingStore = createPartialStore({ const calculateStartTime = (score: Score, query: AudioQuery) => { const firstMora = query.accentPhrases[0].moras[0]; - let startTime = ticksToSeconds( - score.resolution, + let startTime = tickToSecond( + score.notes[0].position, score.tempos, - score.notes[0].position + score.tpqn ); startTime -= query.prePhonemeLength; startTime -= firstMora.consonantLength ?? 0; @@ -1112,9 +1098,9 @@ export const singingStore = createPartialStore({ allPhrases.set(hash, phrase); // フレーズ追加時の処理 const noteEvents = generateNoteEvents( - phrase.score.resolution, + phrase.score.notes, phrase.score.tempos, - phrase.score.notes + phrase.score.tpqn ); const polySynth = new PolySynth(audioContextRef); polySynth.output.connect(channelStripRef.input); @@ -1285,6 +1271,74 @@ export const singingStore = createPartialStore({ IMPORT_MIDI_FILE: { action: createUILockAction( async ({ dispatch }, { filePath }: { filePath?: string }) => { + const convertPosition = ( + position: number, + sourceTpqn: number, + targetTpqn: number + ) => { + return Math.round(position * (targetTpqn / sourceTpqn)); + }; + + const convertDuration = ( + startPosition: number, + endPosition: number, + sourceTpqn: number, + targetTpqn: number + ) => { + const convertedEndPosition = convertPosition( + endPosition, + sourceTpqn, + targetTpqn + ); + const convertedStartPosition = convertPosition( + startPosition, + sourceTpqn, + targetTpqn + ); + return Math.max(1, convertedEndPosition - convertedStartPosition); + }; + + const getTopNotes = (notes: Note[]) => { + const topNotes: Note[] = []; + for (const note of notes) { + if (topNotes.length === 0) { + topNotes.push(note); + continue; + } + const topNote = topNotes[topNotes.length - 1]; + const topNoteEndPos = topNote.position + topNote.duration; + if (topNoteEndPos <= note.position) { + topNotes.push(note); + continue; + } + if (topNote.noteNumber < note.noteNumber) { + topNotes.pop(); + topNotes.push(note); + } + } + return topNotes; + }; + + const removeDuplicateTempos = (tempos: Tempo[]) => { + return tempos.filter((value, index, array) => { + return ( + index === array.length - 1 || + value.position !== array[index + 1].position + ); + }); + }; + + const removeDuplicateTimeSignatures = ( + timeSignatures: TimeSignature[] + ) => { + return timeSignatures.filter((value, index, array) => { + return ( + index === array.length - 1 || + value.position !== array[index + 1].position + ); + }); + }; + if (!filePath) { filePath = await window.electron.showImportFileDialog({ title: "MIDI読み込み", @@ -1299,84 +1353,69 @@ export const singingStore = createPartialStore({ ); const midi = new Midi(midiData); - const score = await dispatch("GET_EMPTY_SCORE"); + const midiTpqn = midi.header.ppq; + const midiTempos = [...midi.header.tempos]; + const midiTimeSignatures = [...midi.header.timeSignatures]; + // TODO: UIで読み込むトラックを選択できるようにする + const midiNotes = [...midi.tracks[0].notes]; // ひとまず1トラック目のみを読み込む - const convertToPosBasedOnRes = (position: number) => { - return Math.round(position * (score.resolution / midi.header.ppq)); - }; + midiTempos.sort((a, b) => a.ticks - b.ticks); + midiTimeSignatures.sort((a, b) => a.ticks - b.ticks); + midiNotes.sort((a, b) => a.ticks - b.ticks); - const convertToDurationBasedOnRes = ( - position: number, - duration: number - ) => { - let endPosition = position + duration; - endPosition = convertToPosBasedOnRes(endPosition); - position = convertToPosBasedOnRes(position); - return Math.max(0, endPosition - position); - }; + const tpqn = DEFAULT_TPQN; - // TODO: UIで読み込むトラックを選択できるようにする - // ひとまず1トラック目のみを読み込む - midi.tracks[0].notes - .map((note) => ({ + let notes = midiNotes.map((value): Note => { + return { id: uuidv4(), - position: convertToPosBasedOnRes(note.ticks), - duration: convertToDurationBasedOnRes( - note.ticks, - note.durationTicks + position: convertPosition(value.ticks, midiTpqn, tpqn), + duration: convertDuration( + value.ticks, + value.ticks + value.durationTicks, + midiTpqn, + tpqn ), - midi: note.midi, - lyric: getDoremiFromNoteNumber(note.midi), - })) - .sort((a, b) => a.position - b.position) - .forEach((note) => { - // ノートの重なりを考慮して、一番音が高いノート（トップノート）のみインポートする - if (score.notes.length === 0) { - score.notes.push(note); - return; - } - const topNote = score.notes[score.notes.length - 1]; - const topNoteEnd = topNote.position + topNote.duration; - if (note.position >= topNoteEnd) { - score.notes.push(note); - return; - } - if (note.midi > topNote.midi) { - score.notes.pop(); - score.notes.push(note); - } - }); - - const tempos = midi.header.tempos - .map((tempo) => ({ - position: convertToPosBasedOnRes(tempo.ticks), - tempo: round(tempo.bpm, 2), - })) - .sort((a, b) => a.position - b.position); - - score.tempos = score.tempos - .concat(tempos) - .filter((value, index, array) => { - if (index === array.length - 1) return true; - return value.position !== array[index + 1].position; - }); + noteNumber: value.midi, + lyric: getDoremiFromNoteNumber(value.midi), + }; + }); + // ノートの重なりを考慮して、一番音が高いノート（トップノート）のみインポートする + notes = getTopNotes(notes); - const timeSignatures = midi.header.timeSignatures - .map((timeSignature) => ({ - position: convertToPosBasedOnRes(timeSignature.ticks), - beats: timeSignature.timeSignature[0], - beatType: timeSignature.timeSignature[1], - })) - .sort((a, b) => a.position - b.position); - - score.timeSignatures = score.timeSignatures - .concat(timeSignatures) - .filter((value, index, array) => { - if (index === array.length - 1) return true; - return value.position !== array[index + 1].position; - }); + let tempos = midiTempos.map((value): Tempo => { + return { + position: convertPosition(value.ticks, midiTpqn, tpqn), + tempo: round(value.bpm, 2), + }; + }); + tempos.unshift({ + position: 0, + tempo: DEFAULT_TEMPO, + }); + tempos = removeDuplicateTempos(tempos); - await dispatch("SET_SCORE", { score }); + let timeSignatures = midiTimeSignatures.map((value): TimeSignature => { + return { + position: convertPosition(value.ticks, midiTpqn, tpqn), + beats: value.timeSignature[0], + beatType: value.timeSignature[1], + }; + }); + timeSignatures.unshift({ + position: 0, + beats: DEFAULT_BEATS, + beatType: DEFAULT_BEAT_TYPE, + }); + timeSignatures = removeDuplicateTimeSignatures(timeSignatures); + + await dispatch("SET_SCORE", { + score: { + tpqn, + tempos, + timeSignatures, + notes, + }, + }); } ), }, @@ -1402,30 +1441,50 @@ export const singingStore = createPartialStore({ ); } - const score = await dispatch("GET_EMPTY_SCORE"); - - const getMeasureDuration = (beats: number, beatType: number) => { - const referenceMeasureDuration = score.resolution * 4; - return Math.round((referenceMeasureDuration * beats) / beatType); + const getMeasureDuration = ( + beats: number, + beatType: number, + tpqn: number + ) => { + const wholeNoteDuration = tpqn * 4; + return Math.round((wholeNoteDuration / beatType) * beats); }; + const tpqn = DEFAULT_TPQN; + const tempos: Tempo[] = [ + { + position: 0, + tempo: DEFAULT_TEMPO, + }, + ]; + const timeSignatures: TimeSignature[] = [ + { + position: 0, + beats: DEFAULT_BEATS, + beatType: DEFAULT_BEAT_TYPE, + }, + ]; + const notes: Note[] = []; + let divisions = 1; let position = 0; let measurePosition = 0; let measureDuration = getMeasureDuration( - score.timeSignatures[0].beats, - score.timeSignatures[0].beatType + timeSignatures[0].beats, + timeSignatures[0].beatType, + tpqn ); - let tieStartNote: Note | null = null; + let tieStartNote: Note | undefined; - const getChild = (element: Element | null, tagName: string) => { - if (element === null) return null; - for (const childElement of element.children) { - if (childElement.tagName === tagName) { - return childElement; + const getChild = (element: Element | undefined, tagName: string) => { + if (element) { + for (const childElement of element.children) { + if (childElement.tagName === tagName) { + return childElement; + } } } - return null; + return undefined; }; const getValueAsNumber = (element: Element) => { @@ -1466,11 +1525,11 @@ export const singingStore = createPartialStore({ const getDuration = (durationElement: Element) => { const duration = getValueAsNumber(durationElement); - return Math.round((score.resolution * duration) / divisions); + return Math.round((tpqn * duration) / divisions); }; const getTie = (elementThatMayBeTied: Element) => { - let tie = false; + let tie: boolean | undefined; for (const childElement of elementThatMayBeTied.children) { if ( childElement.tagName === "tie" || @@ -1490,15 +1549,17 @@ export const singingStore = createPartialStore({ }; const parseSound = (soundElement: Element) => { - if (!soundElement.hasAttribute("tempo")) return; - if (score.tempos.length !== 0) { - const lastTempo = score.tempos[score.tempos.length - 1]; + if (!soundElement.hasAttribute("tempo")) { + return; + } + if (tempos.length !== 0) { + const lastTempo = tempos[tempos.length - 1]; if (lastTempo.position === position) { - score.tempos.pop(); + tempos.pop(); } } const tempo = getAttributeAsNumber(soundElement, "tempo"); - score.tempos.push({ + tempos.push({ position: position, tempo: round(tempo, 2), }); @@ -1518,27 +1579,26 @@ export const singingStore = createPartialStore({ const parseTime = (timeElement: Element) => { const beatsElement = getChild(timeElement, "beats"); - if (beatsElement === null) { + if (!beatsElement) { throw new Error("beats element does not exist."); } const beatTypeElement = getChild(timeElement, "beat-type"); - if (beatTypeElement === null) { + if (!beatTypeElement) { throw new Error("beat-type element does not exist."); } const beats = getValueAsNumber(beatsElement); const beatType = getValueAsNumber(beatTypeElement); - measureDuration = getMeasureDuration(beats, beatType); - if (score.timeSignatures.length !== 0) { - const lastTimeSignature = - score.timeSignatures[score.timeSignatures.length - 1]; + measureDuration = getMeasureDuration(beats, beatType, tpqn); + if (timeSignatures.length !== 0) { + const lastTimeSignature = timeSignatures[timeSignatures.length - 1]; if (lastTimeSignature.position === position) { - score.timeSignatures.pop(); + timeSignatures.pop(); } } - score.timeSignatures.push({ - position: position, - beats: beats, - beatType: beatType, + timeSignatures.push({ + position, + beats, + beatType, }); }; @@ -1559,7 +1619,7 @@ export const singingStore = createPartialStore({ // それらが存在する場合でも読み込めるようにする const durationElement = getChild(noteElement, "duration"); - if (durationElement === null) { + if (!durationElement) { throw new Error("duration element does not exist."); } let duration = getDuration(durationElement); @@ -1571,21 +1631,21 @@ export const singingStore = createPartialStore({ noteEnd = position + duration; } - if (getChild(noteElement, "rest") !== null) { + if (getChild(noteElement, "rest")) { position += duration; return; } const pitchElement = getChild(noteElement, "pitch"); - if (pitchElement === null) { + if (!pitchElement) { throw new Error("pitch element does not exist."); } const octaveElement = getChild(pitchElement, "octave"); - if (octaveElement === null) { + if (!octaveElement) { throw new Error("octave element does not exist."); } const stepElement = getChild(pitchElement, "step"); - if (stepElement === null) { + if (!stepElement) { throw new Error("step element does not exist."); } const alterElement = getChild(pitchElement, "alter"); @@ -1593,7 +1653,7 @@ export const singingStore = createPartialStore({ const octave = getValueAsNumber(octaveElement); const stepNumber = getStepNumber(stepElement); let noteNumber = 12 * (octave + 1) + stepNumber; - if (alterElement !== null) { + if (alterElement) { noteNumber += getValueAsNumber(alterElement); } @@ -1607,25 +1667,25 @@ export const singingStore = createPartialStore({ } } - const note = { - position: position, - duration: duration, - midi: noteNumber, - lyric: lyric, + const note: Note = { id: uuidv4(), + position, + duration, + noteNumber, + lyric, }; - if (tie) { - if (tieStartNote === null) { - tieStartNote = note; + if (tieStartNote) { + if (tie === false) { + tieStartNote.duration = noteEnd - tieStartNote.position; + notes.push(tieStartNote); + tieStartNote = undefined; } } else { - if (tieStartNote === null) { - score.notes.push(note); + if (tie === true) { + tieStartNote = note; } else { - tieStartNote.duration = noteEnd - tieStartNote.position; - score.notes.push(tieStartNote); - tieStartNote = null; + notes.push(note); } } position += duration; @@ -1648,7 +1708,7 @@ export const singingStore = createPartialStore({ } const measureEnd = measurePosition + measureDuration; if (position !== measureEnd) { - tieStartNote = null; + tieStartNote = undefined; position = measureEnd; } }; @@ -1674,7 +1734,14 @@ export const singingStore = createPartialStore({ parseMusicXml(xmlStr); - await dispatch("SET_SCORE", { score }); + await dispatch("SET_SCORE", { + score: { + tpqn, + tempos, + timeSignatures, + notes, + }, + }); } ), }, @@ -1843,9 +1910,9 @@ export const singingStore = createPartialStore({ } else { // レンダリング未完了のフレーズの場合 const noteEvents = generateNoteEvents( - phrase.score.resolution, + phrase.score.notes, phrase.score.tempos, - phrase.score.notes + phrase.score.tpqn ); const polySynth = new PolySynth(offlineAudioContext); polySynth.output.connect(channelStrip.input); diff --git a/src/store/type.ts b/src/store/type.ts index 9028a8fd56..41cef85cd9 100644 --- a/src/store/type.ts +++ b/src/store/type.ts @@ -76,32 +76,6 @@ export type AudioState = { nowGenerating: boolean; }; -export type Tempo = { - position: number; - tempo: number; -}; - -export type TimeSignature = { - position: number; - beats: number; - beatType: number; -}; - -export type Note = { - id: string; - position: number; - duration: number; - midi: number; - lyric: string; -}; - -export type Score = { - resolution: number; - tempos: Tempo[]; - timeSignatures: TimeSignature[]; - notes: Note[]; -}; - export type Command = { unixMillisec: number; undoPatches: Patch[]; @@ -740,6 +714,32 @@ export type AudioPlayerStoreTypes = { * Singing Store Types */ +export type Tempo = { + position: number; + tempo: number; +}; + +export type TimeSignature = { + position: number; + beats: number; + beatType: number; +}; + +export type Note = { + id: string; + position: number; + duration: number; + noteNumber: number; + lyric: string; +}; + +export type Score = { + tpqn: number; + tempos: Tempo[]; + timeSignatures: TimeSignature[]; + notes: Note[]; +}; + export type SingingStoreState = { engineId?: EngineId; styleId?: StyleId;