@marmooo/midy 0.3.6 → 0.3.8

package/esm/midy-GM1.js

@@ -200,7 +200,7 @@ export class MidyGM1 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this.initSoundFontTable()
+            value: Array.from({ length: 128 }, () => [])
         });
         Object.defineProperty(this, "voiceCounter", {
             enumerable: true,
@@ -244,6 +244,12 @@ export class MidyGM1 {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "playPromise", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "timeline", {
             enumerable: true,
             configurable: true,
@@ -275,6 +281,7 @@ export class MidyGM1 {
             length: 1,
             sampleRate: audioContext.sampleRate,
         });
+        this.messageHandlers = this.createMessageHandlers();
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
@@ -282,21 +289,14 @@ export class MidyGM1 {
         this.scheduler.connect(audioContext.destination);
         this.GM1SystemOn();
     }
-    initSoundFontTable() {
-        const table = new Array(128);
-        for (let i = 0; i < 128; i++) {
-            table[i] = new Map();
-        }
-        return table;
-    }
     addSoundFont(soundFont) {
         const index = this.soundFonts.length;
         this.soundFonts.push(soundFont);
         const presetHeaders = soundFont.parsed.presetHeaders;
+        const soundFontTable = this.soundFontTable;
         for (let i = 0; i < presetHeaders.length; i++) {
-            const presetHeader = presetHeaders[i];
-            const banks = this.soundFontTable[presetHeader.preset];
-            banks.set(presetHeader.bank, index);
+            const { preset, bank } = presetHeaders[i];
+            soundFontTable[preset][bank] = index;
         }
     }
     async toUint8Array(input) {
@@ -374,13 +374,16 @@ export class MidyGM1 {
         this.GM1SystemOn();
     }
     getVoiceId(channel, noteNumber, velocity) {
-        const bankNumber = this.calcBank(channel);
-        const soundFontIndex = this.soundFontTable[channel.programNumber]
-            .get(bankNumber);
+        const programNumber = channel.programNumber;
+        const bankTable = this.soundFontTable[programNumber];
+        if (!bankTable)
+            return;
+        const bank = channel.isDrum ? 128 : 0;
+        const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
+        const voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
         const { instrument, sampleID } = voice.generators;
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
@@ -429,13 +432,16 @@ export class MidyGM1 {
         }
         return bufferSource;
     }
-    async scheduleTimelineEvents(t, resumeTime, queueIndex) {
-        while (queueIndex < this.timeline.length) {
-            const event = this.timeline[queueIndex];
-            if (event.startTime > t + this.lookAhead)
+    async scheduleTimelineEvents(scheduleTime, queueIndex) {
+        const timeOffset = this.resumeTime - this.startTime;
+        const lookAheadCheckTime = scheduleTime + timeOffset + this.lookAhead;
+        const schedulingOffset = this.startDelay - timeOffset;
+        const timeline = this.timeline;
+        while (queueIndex < timeline.length) {
+            const event = timeline[queueIndex];
+            if (lookAheadCheckTime < event.startTime)
                 break;
-            const delay = this.startDelay - resumeTime;
-            const startTime = event.startTime + delay;
+            const startTime = event.startTime + schedulingOffset;
             switch (event.type) {
                 case "noteOn":
                     await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime);
@@ -470,69 +476,77 @@ export class MidyGM1 {
         }
         return 0;
     }
-    playNotes() {
-        return new Promise((resolve) => {
-            this.isPlaying = true;
-            this.isPaused = false;
-            this.startTime = this.audioContext.currentTime;
-            let queueIndex = this.getQueueIndex(this.resumeTime);
-            let resumeTime = this.resumeTime - this.startTime;
+    resetAllStates() {
+        this.exclusiveClassNotes.fill(undefined);
+        this.drumExclusiveClassNotes.fill(undefined);
+        this.voiceCache.clear();
+        for (let i = 0; i < this.channels.length; i++) {
+            this.channels[i].scheduledNotes = [];
+            this.resetChannelStates(i);
+        }
+    }
+    updateStates(queueIndex, nextQueueIndex) {
+        if (nextQueueIndex < queueIndex)
+            queueIndex = 0;
+        for (let i = queueIndex; i < nextQueueIndex; i++) {
+            const event = this.timeline[i];
+            switch (event.type) {
+                case "controller":
+                    this.setControlChange(event.channel, event.controllerType, event.value, 0);
+                    break;
+                case "programChange":
+                    this.setProgramChange(event.channel, event.programNumber, 0);
+                    break;
+                case "pitchBend":
+                    this.setPitchBend(event.channel, event.value + 8192, 0);
+                    break;
+                case "sysEx":
+                    this.handleSysEx(event.data, 0);
+            }
+        }
+    }
+    async playNotes() {
+        if (this.audioContext.state === "suspended") {
+            await this.audioContext.resume();
+        }
+        this.isPlaying = true;
+        this.isPaused = false;
+        this.startTime = this.audioContext.currentTime;
+        let queueIndex = this.getQueueIndex(this.resumeTime);
+        let finished = false;
+        this.notePromises = [];
+        while (queueIndex < this.timeline.length) {
+            const now = this.audioContext.currentTime;
+            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
+            if (this.isPausing) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                this.notePromises = [];
+                break;
+            }
+            else if (this.isStopping) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                finished = true;
+                break;
+            }
+            else if (this.isSeeking) {
+                await this.stopNotes(0, true, now);
+                this.startTime = this.audioContext.currentTime;
+                const nextQueueIndex = this.getQueueIndex(this.resumeTime);
+                this.updateStates(queueIndex, nextQueueIndex);
+                queueIndex = nextQueueIndex;
+                this.isSeeking = false;
+                continue;
+            }
+            const waitTime = now + this.noteCheckInterval;
+            await this.scheduleTask(() => { }, waitTime);
+        }
+        if (finished) {
             this.notePromises = [];
-            const schedulePlayback = async () => {
-                if (queueIndex >= this.timeline.length) {
-                    await Promise.all(this.notePromises);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.channels[i].scheduledNotes = [];
-                        this.resetAllStates(i);
-                    }
-                    resolve();
-                    return;
-                }
-                const now = this.audioContext.currentTime;
-                const t = now + resumeTime;
-                queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
-                if (this.isPausing) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.isPausing = false;
-                    this.isPaused = true;
-                    resolve();
-                    return;
-                }
-                else if (this.isStopping) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.channels[i].scheduledNotes = [];
-                        this.resetAllStates(i);
-                    }
-                    this.isStopping = false;
-                    this.isPaused = false;
-                    resolve();
-                    return;
-                }
-                else if (this.isSeeking) {
-                    this.stopNotes(0, true, now);
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.startTime = this.audioContext.currentTime;
-                    queueIndex = this.getQueueIndex(this.resumeTime);
-                    resumeTime = this.resumeTime - this.startTime;
-                    this.isSeeking = false;
-                    await schedulePlayback();
-                }
-                else {
-                    const waitTime = now + this.noteCheckInterval;
-                    await this.scheduleTask(() => { }, waitTime);
-                    await schedulePlayback();
-                }
-            };
-            schedulePlayback();
-        });
+            this.resetAllStates();
+        }
+        this.isPlaying = false;
     }
     ticksToSecond(ticks, secondsPerBeat) {
         return ticks * secondsPerBeat / this.ticksPerBeat;
@@ -540,16 +554,16 @@ export class MidyGM1 {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
+    getSoundFontId(channel) {
+        const programNumber = channel.programNumber;
+        const bank = channel.isDrum ? "128" : "000";
+        const program = programNumber.toString().padStart(3, "0");
+        return `${bank}:${program}`;
+    }
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
-        const tmpChannels = new Array(this.channels.length);
-        for (let i = 0; i < tmpChannels.length; i++) {
-            tmpChannels[i] = {
-                programNumber: -1,
-                bank: this.channels[i].bank,
-            };
-        }
+        const channels = this.channels;
         for (let i = 0; i < midi.tracks.length; i++) {
             const track = midi.tracks[i];
             let currentTicks = 0;
@@ -559,17 +573,15 @@ export class MidyGM1 {
                 event.ticks = currentTicks;
                 switch (event.type) {
                     case "noteOn": {
-                        const channel = tmpChannels[event.channel];
-                        if (channel.programNumber < 0) {
-                            instruments.add(`${channel.bank}:0`);
-                            channel.programNumber = 0;
-                        }
+                        const channel = channels[event.channel];
+                        instruments.add(this.getSoundFontId(channel));
                         break;
                     }
                     case "programChange": {
-                        const channel = tmpChannels[event.channel];
-                        channel.programNumber = event.programNumber;
-                        instruments.add(`${channel.bankNumber}:${channel.programNumber}`);
+                        const channel = channels[event.channel];
+                        this.setProgramChange(event.channel, event.programNumber);
+                        instruments.add(this.getSoundFontId(channel));
+                        break;
                     }
                 }
                 delete event.deltaTime;
@@ -633,26 +645,32 @@ export class MidyGM1 {
         this.resumeTime = 0;
         if (this.voiceCounter.size === 0)
             this.cacheVoiceIds();
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
     }
-    stop() {
+    async stop() {
         if (!this.isPlaying)
             return;
         this.isStopping = true;
+        await this.playPromise;
+        this.isStopping = false;
     }
-    pause() {
+    async pause() {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
         this.resumeTime += now - this.startTime - this.startDelay;
         this.isPausing = true;
+        await this.playPromise;
+        this.isPausing = false;
+        this.isPaused = true;
     }
     async resume() {
         if (!this.isPaused)
             return;
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
+        this.isPaused = false;
     }
     seekTo(second) {
         this.resumeTime = second;
@@ -869,13 +887,16 @@ export class MidyGM1 {
     }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
-        const bankNumber = channel.bank;
-        const soundFontIndex = this.soundFontTable[channel.programNumber]
-            .get(bankNumber);
+        const programNumber = channel.programNumber;
+        const bankTable = this.soundFontTable[programNumber];
+        if (!bankTable)
+            return;
+        const bank = channel.isDrum ? 128 : 0;
+        const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
+        const voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
         if (!voice)
             return;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
@@ -977,7 +998,26 @@ export class MidyGM1 {
         channel.sustainNotes = [];
         return promises;
     }
-    handleMIDIMessage(statusByte, data1, data2, scheduleTime) {
+    createMessageHandlers() {
+        const handlers = new Array(256);
+        // Channel Message
+        handlers[0x80] = (data, scheduleTime) => this.noteOff(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        handlers[0x90] = (data, scheduleTime) => this.noteOn(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        handlers[0xB0] = (data, scheduleTime) => this.setControlChange(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        handlers[0xC0] = (data, scheduleTime) => this.setProgramChange(data[0] & 0x0F, data[1], scheduleTime);
+        handlers[0xE0] = (data, scheduleTime) => this.handlePitchBendMessage(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        return handlers;
+    }
+    handleMessage(data, scheduleTime) {
+        const status = data[0];
+        if (status === 0xF0) {
+            return this.handleSysEx(data.subarray(1), scheduleTime);
+        }
+        const handler = this.messageHandlers[status];
+        if (handler)
+            handler(data, scheduleTime);
+    }
+    handleChannelMessage(statusByte, data1, data2, scheduleTime) {
         const channelNumber = statusByte & 0x0F;
         const messageType = statusByte & 0xF0;
         switch (messageType) {
@@ -1057,28 +1097,36 @@ export class MidyGM1 {
     }
     createVoiceParamsHandlers() {
         return {
-            modLfoToPitch: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToPitch: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
-            vibLfoToPitch: (_channel, _note, _prevValue, _scheduleTime) => { },
-            modLfoToFilterFc: (channel, note, _prevValue, scheduleTime) => {
+            vibLfoToPitch: (_channel, _note, _scheduleTime) => { },
+            modLfoToFilterFc: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToFilterFc(note, scheduleTime);
                 }
             },
-            modLfoToVolume: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToVolume: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToVolume(note, scheduleTime);
                 }
             },
-            chorusEffectsSend: (_channel, _note, _prevValue, _scheduleTime) => { },
-            reverbEffectsSend: (_channel, _note, _prevValue, _scheduleTime) => { },
-            delayModLFO: (_channel, note, _prevValue, scheduleTime) => this.setDelayModLFO(note, scheduleTime),
-            freqModLFO: (_channel, note, _prevValue, scheduleTime) => this.setFreqModLFO(note, scheduleTime),
-            delayVibLFO: (_channel, _note, _prevValue, _scheduleTime) => { },
-            freqVibLFO: (_channel, _note, _prevValue, _scheduleTime) => { },
+            chorusEffectsSend: (_channel, _note, _scheduleTime) => { },
+            reverbEffectsSend: (_channel, _note, _scheduleTime) => { },
+            delayModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setDelayModLFO(note, scheduleTime);
+                }
+            },
+            freqModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setFreqModLFO(note, scheduleTime);
+                }
+            },
+            delayVibLFO: (_channel, _note, _scheduleTime) => { },
+            freqVibLFO: (_channel, _note, _scheduleTime) => { },
         };
     }
     getControllerState(channel, noteNumber, velocity) {
@@ -1101,7 +1149,7 @@ export class MidyGM1 {
                     continue;
                 note.voiceParams[key] = value;
                 if (key in this.voiceParamsHandlers) {
-                    this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
+                    this.voiceParamsHandlers[key](channel, note, scheduleTime);
                 }
                 else {
                     if (volumeEnvelopeKeySet.has(key))
@@ -1272,8 +1320,8 @@ export class MidyGM1 {
     }
     handlePitchBendRangeRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
-        this.limitData(channel, 0, 127, 0, 99);
-        const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
+        this.limitData(channel, 0, 127, 0, 127);
+        const pitchBendRange = (channel.dataMSB + channel.dataLSB / 128) * 100;
         this.setPitchBendRange(channelNumber, pitchBendRange, scheduleTime);
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
@@ -1281,7 +1329,7 @@ export class MidyGM1 {
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
-        const next = value / 128;
+        const next = value / 12800;
         state.pitchWheelSensitivity = next;
         channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1290,14 +1338,15 @@ export class MidyGM1 {
     handleFineTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
-        const fineTuning = channel.dataMSB * 128 + channel.dataLSB;
+        const value = channel.dataMSB * 128 + channel.dataLSB;
+        const fineTuning = (value - 8192) / 8192 * 100;
         this.setFineTuning(channelNumber, fineTuning, scheduleTime);
     }
     setFineTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.fineTuning;
-        const next = (value - 8192) / 8.192; // cent
+        const next = value;
         channel.fineTuning = next;
         channel.detune += next - prev;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1305,14 +1354,14 @@ export class MidyGM1 {
     handleCoarseTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
-        const coarseTuning = channel.dataMSB;
+        const coarseTuning = (channel.dataMSB - 64) * 100;
         this.setCoarseTuning(channelNumber, coarseTuning, scheduleTime);
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.coarseTuning;
-        const next = (value - 64) * 100; // cent
+        const next = value;
         channel.coarseTuning = next;
         channel.detune += next - prev;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1321,7 +1370,7 @@ export class MidyGM1 {
         scheduleTime ??= this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
-    resetAllStates(channelNumber) {
+    resetChannelStates(channelNumber) {
         const scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
@@ -1396,10 +1445,8 @@ export class MidyGM1 {
         for (let i = 0; i < this.channels.length; i++) {
             this.allSoundOff(i, 0, scheduleTime);
             const channel = this.channels[i];
-            channel.bank = 0;
             channel.isDrum = false;
         }
-        this.channels[9].bank = 128;
         this.channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
@@ -1420,16 +1467,11 @@ export class MidyGM1 {
         const volume = (data[5] * 128 + data[4]) / 16383;
         this.setMasterVolume(volume, scheduleTime);
     }
-    setMasterVolume(volume, scheduleTime) {
+    setMasterVolume(value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        if (volume < 0 && 1 < volume) {
-            console.error("Master Volume is out of range");
-        }
-        else {
-            this.masterVolume.gain
-                .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(volume * volume, scheduleTime);
-        }
+        this.masterVolume.gain
+            .cancelScheduledValues(scheduleTime)
+            .setValueAtTime(value * value, scheduleTime);
     }
     handleSysEx(data, scheduleTime) {
         switch (data[0]) {
@@ -1466,15 +1508,15 @@ Object.defineProperty(MidyGM1, "channelSettings", {
     configurable: true,
     writable: true,
     value: {
+        scheduleIndex: 0,
         detune: 0,
         programNumber: 0,
-        bank: 0,
         dataMSB: 0,
         dataLSB: 0,
         rpnMSB: 127,
         rpnLSB: 127,
         modulationDepthRange: 50, // cent
-        fineTuning: 0, // cb
-        coarseTuning: 0, // cb
+        fineTuning: 0, // cent
+        coarseTuning: 0, // cent
     }
 });