@marmooo/midy 0.3.7 → 0.4.0

package/esm/midy-GM2.js

@@ -1,7 +1,19 @@
 import { parseMidi } from "midi-file";
 import { parse, SoundFont } from "@marmooo/soundfont-parser";
 class Note {
-    constructor(noteNumber, velocity, startTime, voice, voiceParams) {
+    constructor(noteNumber, velocity, startTime) {
+        Object.defineProperty(this, "voice", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "voiceParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "index", {
             enumerable: true,
             configurable: true,
@@ -14,6 +26,12 @@ class Note {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "pending", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
         Object.defineProperty(this, "bufferSource", {
             enumerable: true,
             configurable: true,
@@ -89,8 +107,6 @@ class Note {
         this.noteNumber = noteNumber;
         this.velocity = velocity;
         this.startTime = startTime;
-        this.voice = voice;
-        this.voiceParams = voiceParams;
     }
 }
 const drumExclusiveClassesByKit = new Array(57);
@@ -272,6 +288,18 @@ export class MidyGM2 {
             writable: true,
             value: 0
         });
+        Object.defineProperty(this, "lastActiveSensing", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "activeSensingThreshold", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0.3
+        });
         Object.defineProperty(this, "noteCheckInterval", {
             enumerable: true,
             configurable: true,
@@ -312,7 +340,7 @@ export class MidyGM2 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this.initSoundFontTable()
+            value: Array.from({ length: 128 }, () => [])
         });
         Object.defineProperty(this, "voiceCounter", {
             enumerable: true,
@@ -326,6 +354,12 @@ export class MidyGM2 {
             writable: true,
             value: new Map()
         });
+        Object.defineProperty(this, "realtimeVoiceCache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         Object.defineProperty(this, "isPlaying", {
             enumerable: true,
             configurable: true,
@@ -399,8 +433,10 @@ export class MidyGM2 {
             length: 1,
             sampleRate: audioContext.sampleRate,
         });
+        this.messageHandlers = this.createMessageHandlers();
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
+        this.keyBasedControllerHandlers = this.createKeyBasedControllerHandlers();
         this.channels = this.createChannels(audioContext);
         this.reverbEffect = this.createReverbEffect(audioContext);
         this.chorusEffect = this.createChorusEffect(audioContext);
@@ -410,21 +446,14 @@ export class MidyGM2 {
         this.scheduler.connect(audioContext.destination);
         this.GM2SystemOn();
     }
-    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) {
@@ -502,13 +531,17 @@ export class MidyGM2 {
         this.GM2SystemOn();
     }
     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 bankLSB = channel.isDrum ? 128 : channel.bankLSB;
+        const bank = bankTable[bankLSB] !== undefined ? bankLSB : 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;
     }
@@ -577,19 +610,22 @@ export class MidyGM2 {
         }
         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);
+                    await this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
                     break;
                 case "noteOff": {
-                    const notePromise = this.scheduleNoteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
+                    const notePromise = this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     if (notePromise)
                         this.notePromises.push(notePromise);
                     break;
@@ -625,6 +661,7 @@ export class MidyGM2 {
         this.exclusiveClassNotes.fill(undefined);
         this.drumExclusiveClassNotes.fill(undefined);
         this.voiceCache.clear();
+        this.realtimeVoiceCache.clear();
         for (let i = 0; i < this.channels.length; i++) {
             this.channels[i].scheduledNotes = [];
             this.resetChannelStates(i);
@@ -658,13 +695,17 @@ export class MidyGM2 {
         this.isPaused = false;
         this.startTime = this.audioContext.currentTime;
         let queueIndex = this.getQueueIndex(this.resumeTime);
-        let resumeTime = this.resumeTime - this.startTime;
         let finished = false;
         this.notePromises = [];
         while (queueIndex < this.timeline.length) {
             const now = this.audioContext.currentTime;
-            const t = now + resumeTime;
-            queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
+            if (0 < this.lastActiveSensing &&
+                this.activeSensingThreshold < performance.now() - this.lastActiveSensing) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                finished = true;
+                break;
+            }
             if (this.isPausing) {
                 await this.stopNotes(0, true, now);
                 await this.audioContext.suspend();
@@ -683,16 +724,17 @@ export class MidyGM2 {
                 const nextQueueIndex = this.getQueueIndex(this.resumeTime);
                 this.updateStates(queueIndex, nextQueueIndex);
                 queueIndex = nextQueueIndex;
-                resumeTime = this.resumeTime - this.startTime;
                 this.isSeeking = false;
                 continue;
             }
+            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
             const waitTime = now + this.noteCheckInterval;
             await this.scheduleTask(() => { }, waitTime);
         }
         if (finished) {
             this.notePromises = [];
             this.resetAllStates();
+            this.lastActiveSensing = 0;
         }
         this.isPlaying = false;
     }
@@ -702,17 +744,17 @@ export class MidyGM2 {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
+    getSoundFontId(channel) {
+        const programNumber = channel.programNumber;
+        const bankNumber = channel.isDrum ? 128 : channel.bankLSB;
+        const bank = bankNumber.toString().padStart(3, "0");
+        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,
-                bankMSB: this.channels[i].bankMSB,
-                bankLSB: this.channels[i].bankLSB,
-            };
-        }
+        const channels = this.channels;
         for (let i = 0; i < midi.tracks.length; i++) {
             const track = midi.tracks[i];
             let currentTicks = 0;
@@ -722,48 +764,40 @@ export class MidyGM2 {
                 event.ticks = currentTicks;
                 switch (event.type) {
                     case "noteOn": {
-                        const channel = tmpChannels[event.channel];
-                        if (channel.programNumber < 0) {
-                            channel.programNumber = event.programNumber;
-                            switch (channel.bankMSB) {
-                                case 120:
-                                    instruments.add(`128:0`);
-                                    break;
-                                case 121:
-                                    instruments.add(`${channel.bankLSB}:0`);
-                                    break;
-                                default: {
-                                    const bankNumber = channel.bankMSB * 128 + channel.bankLSB;
-                                    instruments.add(`${bankNumber}:0`);
-                                }
-                            }
-                            channel.programNumber = 0;
-                        }
+                        const channel = channels[event.channel];
+                        instruments.add(this.getSoundFontId(channel));
                         break;
                     }
                     case "controller":
                         switch (event.controllerType) {
                             case 0:
-                                tmpChannels[event.channel].bankMSB = event.value;
+                                this.setBankMSB(event.channel, event.value);
                                 break;
                             case 32:
-                                tmpChannels[event.channel].bankLSB = event.value;
+                                this.setBankLSB(event.channel, event.value);
                                 break;
                         }
                         break;
                     case "programChange": {
-                        const channel = tmpChannels[event.channel];
-                        channel.programNumber = event.programNumber;
-                        switch (channel.bankMSB) {
-                            case 120:
-                                instruments.add(`128:${channel.programNumber}`);
-                                break;
-                            case 121:
-                                instruments.add(`${channel.bankLSB}:${channel.programNumber}`);
-                                break;
-                            default: {
-                                const bankNumber = channel.bankMSB * 128 + channel.bankLSB;
-                                instruments.add(`${bankNumber}:${channel.programNumber}`);
+                        const channel = channels[event.channel];
+                        this.setProgramChange(event.channel, event.programNumber);
+                        instruments.add(this.getSoundFontId(channel));
+                        break;
+                    }
+                    case "sysEx": {
+                        const data = event.data;
+                        if (data[0] === 126 && data[1] === 9 && data[2] === 3) {
+                            switch (data[3]) {
+                                case 1:
+                                    this.GM1SystemOn(scheduleTime);
+                                    break;
+                                case 2: // GM System Off
+                                    break;
+                                case 3:
+                                    this.GM2SystemOn(scheduleTime);
+                                    break;
+                                default:
+                                    console.warn(`Unsupported Exclusive Message: ${data}`);
                             }
                         }
                     }
@@ -802,7 +836,7 @@ export class MidyGM2 {
         const channel = this.channels[channelNumber];
         const promises = [];
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
+            const promise = this.noteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
@@ -812,7 +846,7 @@ export class MidyGM2 {
         const channel = this.channels[channelNumber];
         const promises = [];
         this.processScheduledNotes(channel, (note) => {
-            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
+            const promise = this.noteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
@@ -845,7 +879,7 @@ export class MidyGM2 {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
-        this.resumeTime += now - this.startTime - this.startDelay;
+        this.resumeTime = now - this.startTime - this.startDelay;
         this.isPausing = true;
         await this.playPromise;
         this.isPausing = false;
@@ -871,11 +905,13 @@ export class MidyGM2 {
             if (totalTime < event.startTime)
                 totalTime = event.startTime;
         }
-        return totalTime;
+        return totalTime + this.startDelay;
     }
     currentTime() {
+        if (!this.isPlaying)
+            return this.resumeTime;
         const now = this.audioContext.currentTime;
-        return this.resumeTime + now - this.startTime - this.startDelay;
+        return now + this.resumeTime - this.startTime;
     }
     processScheduledNotes(channel, callback) {
         const scheduledNotes = channel.scheduledNotes;
@@ -1086,7 +1122,7 @@ export class MidyGM2 {
     updateDetune(channel, note, scheduleTime) {
         const noteDetune = this.calcNoteDetune(channel, note);
         const detune = channel.detune + noteDetune;
-        if (0.5 <= channel.state.portamento && 0 <= note.portamentoNoteNumber) {
+        if (this.isPortamento(channel, note)) {
             const startTime = note.startTime;
             const deltaCent = (note.noteNumber - note.portamentoNoteNumber) * 100;
             const portamentoTime = startTime + this.getPortamentoTime(channel, note);
@@ -1302,31 +1338,42 @@ export class MidyGM2 {
         note.vibratoLFO.connect(note.vibratoDepth);
         note.vibratoDepth.connect(note.bufferSource.detune);
     }
-    async getAudioBuffer(channel, noteNumber, velocity, voiceParams) {
+    async getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime) {
         const audioBufferId = this.getVoiceId(channel, noteNumber, velocity);
-        const cache = this.voiceCache.get(audioBufferId);
-        if (cache) {
-            cache.counter += 1;
-            if (cache.maxCount <= cache.counter) {
-                this.voiceCache.delete(audioBufferId);
-            }
-            return cache.audioBuffer;
-        }
-        else {
-            const maxCount = this.voiceCounter.get(audioBufferId) ?? 0;
+        if (realtime) {
+            const cachedAudioBuffer = this.realtimeVoiceCache.get(audioBufferId);
+            if (cachedAudioBuffer)
+                return cachedAudioBuffer;
             const audioBuffer = await this.createAudioBuffer(voiceParams);
-            const cache = { audioBuffer, maxCount, counter: 1 };
-            this.voiceCache.set(audioBufferId, cache);
+            this.realtimeVoiceCache.set(audioBufferId, audioBuffer);
             return audioBuffer;
         }
+        else {
+            const cache = this.voiceCache.get(audioBufferId);
+            if (cache) {
+                cache.counter += 1;
+                if (cache.maxCount <= cache.counter) {
+                    this.voiceCache.delete(audioBufferId);
+                }
+                return cache.audioBuffer;
+            }
+            else {
+                const maxCount = this.voiceCounter.get(audioBufferId) ?? 0;
+                const audioBuffer = await this.createAudioBuffer(voiceParams);
+                const cache = { audioBuffer, maxCount, counter: 1 };
+                this.voiceCache.set(audioBufferId, cache);
+                return audioBuffer;
+            }
+        }
     }
-    async createNote(channel, voice, noteNumber, velocity, startTime) {
+    async setNoteAudioNode(channel, note, realtime) {
         const now = this.audioContext.currentTime;
+        const { noteNumber, velocity, startTime } = note;
         const state = channel.state;
         const controllerState = this.getControllerState(channel, noteNumber, velocity);
-        const voiceParams = voice.getAllParams(controllerState);
-        const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
-        const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams);
+        const voiceParams = note.voice.getAllParams(controllerState);
+        note.voiceParams = voiceParams;
+        const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime);
         note.bufferSource = this.createBufferSource(channel, noteNumber, voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
@@ -1337,7 +1384,7 @@ export class MidyGM2 {
         if (prevNote && prevNote.noteNumber !== noteNumber) {
             note.portamentoNoteNumber = prevNote.noteNumber;
         }
-        if (0.5 <= channel.state.portamento && 0 <= note.portamentoNoteNumber) {
+        if (!channel.isDrum && this.isPortamento(channel, note)) {
             this.setPortamentoVolumeEnvelope(channel, note, now);
             this.setPortamentoFilterEnvelope(channel, note, now);
             this.setPortamentoPitchEnvelope(note, now);
@@ -1365,22 +1412,6 @@ export class MidyGM2 {
         note.bufferSource.start(startTime);
         return note;
     }
-    calcBank(channel) {
-        switch (this.mode) {
-            case "GM1":
-                if (channel.isDrum)
-                    return 128;
-                return 0;
-            case "GM2":
-                if (channel.bankMSB === 121)
-                    return 0;
-                if (channel.isDrum)
-                    return 128;
-                return channel.bank;
-            default:
-                return channel.bank;
-        }
-    }
     handleExclusiveClass(note, channelNumber, startTime) {
         const exclusiveClass = note.voiceParams.exclusiveClass;
         if (exclusiveClass === 0)
@@ -1389,7 +1420,7 @@ export class MidyGM2 {
         if (prev) {
             const [prevNote, prevChannelNumber] = prev;
             if (prevNote && !prevNote.ending) {
-                this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
+                this.noteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
                 startTime, true);
             }
         }
@@ -1409,23 +1440,14 @@ export class MidyGM2 {
             channelNumber;
         const prevNote = this.drumExclusiveClassNotes[index];
         if (prevNote && !prevNote.ending) {
-            this.scheduleNoteOff(channelNumber, prevNote.noteNumber, 0, // velocity,
+            this.noteOff(channelNumber, prevNote.noteNumber, 0, // velocity,
             startTime, true);
         }
         this.drumExclusiveClassNotes[index] = note;
     }
-    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
+    setNoteRouting(channelNumber, note, startTime) {
         const channel = this.channels[channelNumber];
-        const bankNumber = this.calcBank(channel, channelNumber);
-        const soundFontIndex = this.soundFontTable[channel.programNumber]
-            .get(bankNumber);
-        if (soundFontIndex === undefined)
-            return;
-        const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
-        if (!voice)
-            return;
-        const note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
+        const { noteNumber, volumeEnvelopeNode } = note;
         if (channel.isDrum) {
             const { keyBasedGainLs, keyBasedGainRs } = channel;
             let gainL = keyBasedGainLs[noteNumber];
@@ -1435,25 +1457,48 @@ export class MidyGM2 {
                 gainL = keyBasedGainLs[noteNumber] = audioNodes.gainL;
                 gainR = keyBasedGainRs[noteNumber] = audioNodes.gainR;
             }
-            note.volumeEnvelopeNode.connect(gainL);
-            note.volumeEnvelopeNode.connect(gainR);
+            volumeEnvelopeNode.connect(gainL);
+            volumeEnvelopeNode.connect(gainR);
         }
         else {
-            note.volumeEnvelopeNode.connect(channel.gainL);
-            note.volumeEnvelopeNode.connect(channel.gainR);
+            volumeEnvelopeNode.connect(channel.gainL);
+            volumeEnvelopeNode.connect(channel.gainR);
         }
         if (0.5 <= channel.state.sustainPedal) {
             channel.sustainNotes.push(note);
         }
         this.handleExclusiveClass(note, channelNumber, startTime);
         this.handleDrumExclusiveClass(note, channelNumber, startTime);
+    }
+    async noteOn(channelNumber, noteNumber, velocity, startTime) {
+        const channel = this.channels[channelNumber];
+        const realtime = startTime === undefined;
+        if (realtime)
+            startTime = this.audioContext.currentTime;
+        const note = new Note(noteNumber, velocity, startTime);
         const scheduledNotes = channel.scheduledNotes;
         note.index = scheduledNotes.length;
         scheduledNotes.push(note);
-    }
-    noteOn(channelNumber, noteNumber, velocity, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
-        return this.scheduleNoteOn(channelNumber, noteNumber, velocity, scheduleTime, undefined);
+        const programNumber = channel.programNumber;
+        const bankTable = this.soundFontTable[programNumber];
+        if (!bankTable)
+            return;
+        const bankLSB = channel.isDrum ? 128 : channel.bankLSB;
+        const bank = bankTable[bankLSB] !== undefined ? bankLSB : 0;
+        const soundFontIndex = bankTable[bank];
+        if (soundFontIndex === undefined)
+            return;
+        const soundFont = this.soundFonts[soundFontIndex];
+        note.voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
+        if (!note.voice)
+            return;
+        await this.setNoteAudioNode(channel, note, realtime);
+        this.setNoteRouting(channelNumber, note, startTime);
+        note.pending = false;
+        const off = note.offEvent;
+        if (off) {
+            this.noteOff(channelNumber, noteNumber, off.velocity, off.startTime);
+        }
     }
     disconnectNote(note) {
         note.bufferSource.disconnect();
@@ -1476,6 +1521,7 @@ export class MidyGM2 {
         }
     }
     releaseNote(channel, note, endTime) {
+        endTime ??= this.audioContext.currentTime;
         const volRelease = endTime + note.voiceParams.volRelease;
         const modRelease = endTime + note.voiceParams.modRelease;
         const stopTime = Math.min(volRelease, modRelease);
@@ -1496,7 +1542,7 @@ export class MidyGM2 {
             }, stopTime);
         });
     }
-    scheduleNoteOff(channelNumber, noteNumber, _velocity, endTime, force) {
+    noteOff(channelNumber, noteNumber, velocity, endTime, force) {
         const channel = this.channels[channelNumber];
         const state = channel.state;
         if (!force) {
@@ -1515,6 +1561,10 @@ export class MidyGM2 {
         if (index < 0)
             return;
         const note = channel.scheduledNotes[index];
+        if (note.pending) {
+            note.offEvent = { velocity, startTime: endTime };
+            return;
+        }
         note.ending = true;
         this.setNoteIndex(channel, index);
         this.releaseNote(channel, note, endTime);
@@ -1545,16 +1595,12 @@ export class MidyGM2 {
         }
         return -1;
     }
-    noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
-        return this.scheduleNoteOff(channelNumber, noteNumber, velocity, scheduleTime, false);
-    }
     releaseSustainPedal(channelNumber, halfVelocity, scheduleTime) {
         const velocity = halfVelocity * 2;
         const channel = this.channels[channelNumber];
         const promises = [];
         for (let i = 0; i < channel.sustainNotes.length; i++) {
-            const promise = this.scheduleNoteOff(channelNumber, channel.sustainNotes[i].noteNumber, velocity, scheduleTime);
+            const promise = this.noteOff(channelNumber, channel.sustainNotes[i].noteNumber, velocity, scheduleTime);
             promises.push(promise);
         }
         channel.sustainNotes = [];
@@ -1568,47 +1614,51 @@ export class MidyGM2 {
         channel.state.sostenutoPedal = 0;
         for (let i = 0; i < sostenutoNotes.length; i++) {
             const note = sostenutoNotes[i];
-            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime);
+            const promise = this.noteOff(channelNumber, note.noteNumber, velocity, scheduleTime);
             promises.push(promise);
         }
         channel.sostenutoNotes = [];
         return promises;
     }
-    handleMIDIMessage(statusByte, data1, data2, scheduleTime) {
-        const channelNumber = statusByte & 0x0F;
-        const messageType = statusByte & 0xF0;
-        switch (messageType) {
-            case 0x80:
-                return this.noteOff(channelNumber, data1, data2, scheduleTime);
-            case 0x90:
-                return this.noteOn(channelNumber, data1, data2, scheduleTime);
-            case 0xB0:
-                return this.setControlChange(channelNumber, data1, data2, scheduleTime);
-            case 0xC0:
-                return this.setProgramChange(channelNumber, data1, scheduleTime);
-            case 0xD0:
-                return this.setChannelPressure(channelNumber, data1, scheduleTime);
-            case 0xE0:
-                return this.handlePitchBendMessage(channelNumber, data1, data2, scheduleTime);
-            default:
-                console.warn(`Unsupported MIDI message: ${messageType.toString(16)}`);
+    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[0xD0] = (data, scheduleTime) => this.setChannelPressure(data[0] & 0x0F, data[1], scheduleTime);
+        handlers[0xE0] = (data, scheduleTime) => this.handlePitchBendMessage(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        // System Real Time Message
+        handlers[0xFE] = (_data, _scheduleTime) => this.activeSensing();
+        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);
+    }
+    activeSensing() {
+        this.lastActiveSensing = performance.now();
     }
     setProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
-        channel.bank = channel.bankMSB * 128 + channel.bankLSB;
         channel.programNumber = programNumber;
         if (this.mode === "GM2") {
             switch (channel.bankMSB) {
                 case 120:
                     channel.isDrum = true;
+                    channel.keyBasedTable.fill(-1);
                     break;
                 case 121:
                     channel.isDrum = false;
                     break;
             }
         }
-        channel.keyBasedTable.fill(-1);
     }
     setChannelPressure(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -1933,22 +1983,20 @@ export class MidyGM2 {
         this.updateModulation(channel, scheduleTime);
     }
     updatePortamento(channel, scheduleTime) {
+        if (channel.isDrum)
+            return;
         this.processScheduledNotes(channel, (note) => {
-            if (0.5 <= channel.state.portamento) {
-                if (0 <= note.portamentoNoteNumber) {
-                    this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
-                    this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
-                    this.setPortamentoPitchEnvelope(note, scheduleTime);
-                    this.updateDetune(channel, note, scheduleTime);
-                }
+            if (this.isPortamento(channel, note)) {
+                this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
+                this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
+                this.setPortamentoPitchEnvelope(note, scheduleTime);
+                this.updateDetune(channel, note, scheduleTime);
             }
             else {
-                if (0 <= note.portamentoNoteNumber) {
-                    this.setVolumeEnvelope(channel, note, scheduleTime);
-                    this.setFilterEnvelope(channel, note, scheduleTime);
-                    this.setPitchEnvelope(note, scheduleTime);
-                    this.updateDetune(channel, note, scheduleTime);
-                }
+                this.setVolumeEnvelope(channel, note, scheduleTime);
+                this.setFilterEnvelope(channel, note, scheduleTime);
+                this.setPitchEnvelope(note, scheduleTime);
+                this.updateDetune(channel, note, scheduleTime);
             }
         });
     }
@@ -2054,6 +2102,9 @@ export class MidyGM2 {
             this.releaseSustainPedal(channelNumber, value, scheduleTime);
         }
     }
+    isPortamento(channel, note) {
+        return 0.5 <= channel.state.portamento && 0 <= note.portamentoNoteNumber;
+    }
     setPortamento(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
@@ -2090,7 +2141,7 @@ export class MidyGM2 {
         scheduleTime ??= this.audioContext.currentTime;
         state.softPedal = softPedal / 127;
         this.processScheduledNotes(channel, (note) => {
-            if (0.5 <= state.portamento && 0 <= note.portamentoNoteNumber) {
+            if (this.isPortamento(channel, note)) {
                 this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
                 this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
             }
@@ -2358,11 +2409,9 @@ export class MidyGM2 {
             const channel = this.channels[i];
             channel.bankMSB = 0;
             channel.bankLSB = 0;
-            channel.bank = 0;
             channel.isDrum = false;
         }
         this.channels[9].bankMSB = 1;
-        this.channels[9].bank = 128;
         this.channels[9].isDrum = true;
     }
     GM2SystemOn(scheduleTime) {
@@ -2373,11 +2422,9 @@ export class MidyGM2 {
             const channel = this.channels[i];
             channel.bankMSB = 121;
             channel.bankLSB = 0;
-            channel.bank = 121 * 128;
             channel.isDrum = false;
         }
         this.channels[9].bankMSB = 120;
-        this.channels[9].bank = 120 * 128;
         this.channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
@@ -2422,16 +2469,11 @@ export class MidyGM2 {
         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);
     }
     handleMasterFineTuningSysEx(data, scheduleTime) {
         const value = (data[5] * 128 + data[4]) / 16383;
@@ -2794,6 +2836,22 @@ export class MidyGM2 {
         const controlValue = channel.keyBasedTable[index];
         return controlValue;
     }
+    createKeyBasedControllerHandlers() {
+        const handlers = new Array(128);
+        handlers[7] = (channel, keyNumber, scheduleTime) => this.updateKeyBasedVolume(channel, keyNumber, scheduleTime);
+        handlers[10] = (channel, keyNumber, scheduleTime) => this.updateKeyBasedVolume(channel, keyNumber, scheduleTime);
+        handlers[91] = (channel, keyNumber, scheduleTime) => this.processScheduledNotes(channel, (note) => {
+            if (note.noteNumber === keyNumber) {
+                this.setReverbSend(channel, note, scheduleTime);
+            }
+        });
+        handlers[93] = (channel, keyNumber, scheduleTime) => this.processScheduledNotes(channel, (note) => {
+            if (note.noteNumber === keyNumber) {
+                this.setChorusSend(channel, note, scheduleTime);
+            }
+        });
+        return handlers;
+    }
     handleKeyBasedInstrumentControlSysEx(data, scheduleTime) {
         const channelNumber = data[4];
         const channel = this.channels[channelNumber];
@@ -2806,26 +2864,9 @@ export class MidyGM2 {
             const value = data[i + 1];
             const index = keyNumber * 128 + controllerType;
             table[index] = value;
-            switch (controllerType) {
-                case 7:
-                case 10:
-                    this.updateKeyBasedVolume(channel, keyNumber, scheduleTime);
-                    break;
-                case 91:
-                    this.processScheduledNotes(channel, (note) => {
-                        if (note.noteNumber === keyNumber) {
-                            this.setReverbSend(channel, note, scheduleTime);
-                        }
-                    });
-                    break;
-                case 93:
-                    this.processScheduledNotes(channel, (note) => {
-                        if (note.noteNumber === keyNumber) {
-                            this.setChorusSend(channel, note, scheduleTime);
-                        }
-                    });
-                    break;
-            }
+            const handler = this.keyBasedControllerHandlers[controllerType];
+            if (handler)
+                handler(channel, keyNumber, scheduleTime);
         }
     }
     handleSysEx(data, scheduleTime) {
@@ -2866,7 +2907,6 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         scheduleIndex: 0,
         detune: 0,
         programNumber: 0,
-        bank: 121 * 128,
         bankMSB: 121,
         bankLSB: 0,
         dataMSB: 0,