@marmooo/midy 0.2.9 → 0.3.1

package/esm/midy-GM2.js

@@ -151,6 +151,39 @@ class Note {
         this.voiceParams = voiceParams;
     }
 }
+const drumExclusiveClassesByKit = new Array(57);
+const drumExclusiveClassCount = 10;
+const standardSet = new Uint8Array(128);
+standardSet[42] = 1;
+standardSet[44] = 1;
+standardSet[46] = 1; // HH
+standardSet[71] = 2;
+standardSet[72] = 2; // Whistle
+standardSet[73] = 3;
+standardSet[74] = 3; // Guiro
+standardSet[78] = 4;
+standardSet[79] = 4; // Cuica
+standardSet[80] = 5;
+standardSet[81] = 5; // Triangle
+standardSet[29] = 6;
+standardSet[30] = 6; // Scratch
+standardSet[86] = 7;
+standardSet[87] = 7; // Surdo
+drumExclusiveClassesByKit[0] = standardSet;
+const analogSet = new Uint8Array(128);
+analogSet[42] = 8;
+analogSet[44] = 8;
+analogSet[46] = 8; // CHH
+drumExclusiveClassesByKit[25] = analogSet;
+const orchestraSet = new Uint8Array(128);
+orchestraSet[27] = 9;
+orchestraSet[28] = 9;
+orchestraSet[29] = 9; // HH
+drumExclusiveClassesByKit[48] = orchestraSet;
+const sfxSet = new Uint8Array(128);
+sfxSet[41] = 10;
+sfxSet[42] = 10; // Scratch
+drumExclusiveClassesByKit[56] = sfxSet;
 // normalized to 0-1 for use with the SF2 modulator model
 const defaultControllerState = {
     noteOnVelocity: { type: 2, defaultValue: 0 },
@@ -245,18 +278,6 @@ export class MidyGM2 {
             writable: true,
             value: "GM2"
         });
-        Object.defineProperty(this, "ticksPerBeat", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 120
-        });
-        Object.defineProperty(this, "totalTime", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
         Object.defineProperty(this, "masterFineTuning", {
             enumerable: true,
             configurable: true,
@@ -290,6 +311,24 @@ export class MidyGM2 {
                 delayTimes: this.generateDistributedArray(0.02, 2, 0.5),
             }
         });
+        Object.defineProperty(this, "numChannels", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 16
+        });
+        Object.defineProperty(this, "ticksPerBeat", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 120
+        });
+        Object.defineProperty(this, "totalTime", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
         Object.defineProperty(this, "noteCheckInterval", {
             enumerable: true,
             configurable: true,
@@ -392,11 +431,17 @@ export class MidyGM2 {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "exclusiveClassMap", {
+        Object.defineProperty(this, "exclusiveClassNotes", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new SparseMap(128)
+            value: new Array(128)
+        });
+        Object.defineProperty(this, "drumExclusiveClassNotes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Array(this.numChannels * drumExclusiveClassCount)
         });
         Object.defineProperty(this, "defaultOptions", {
             enumerable: true,
@@ -490,8 +535,10 @@ export class MidyGM2 {
         };
     }
     createChannels(audioContext) {
-        const channels = Array.from({ length: 16 }, () => {
+        const channels = Array.from({ length: this.numChannels }, () => {
             return {
+                currentBufferSource: null,
+                isDrum: false,
                 ...this.constructor.channelSettings,
                 state: new ControllerState(),
                 controlTable: this.initControlTable(),
@@ -535,24 +582,10 @@ export class MidyGM2 {
             return audioBuffer;
         }
     }
-    calcLoopMode(channel, note, voiceParams) {
-        if (channel.isDrum) {
-            const noteNumber = note.noteNumber;
-            if (noteNumber === 88 || 47 <= noteNumber && noteNumber <= 84) {
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-        else {
-            return voiceParams.sampleModes % 2 !== 0;
-        }
-    }
-    createBufferSource(channel, note, voiceParams, audioBuffer) {
+    createBufferSource(voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
-        bufferSource.loop = this.calcLoopMode(channel, note, voiceParams);
+        bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
         if (bufferSource.loop) {
             bufferSource.loopStart = voiceParams.loopStart / voiceParams.sampleRate;
             bufferSource.loopEnd = voiceParams.loopEnd / voiceParams.sampleRate;
@@ -585,7 +618,7 @@ export class MidyGM2 {
             const startTime = event.startTime + this.startDelay - offset;
             switch (event.type) {
                 case "noteOn":
-                    if (event.velocity !== 0) {
+                    if (0 < event.velocity) {
                         await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime, event.portamento);
                         break;
                     }
@@ -640,7 +673,8 @@ export class MidyGM2 {
                 if (queueIndex >= this.timeline.length) {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
-                    this.exclusiveClassMap.clear();
+                    this.exclusiveClassNotes.fill(undefined);
+                    this.drumExclusiveClassNotes.fill(undefined);
                     this.audioBufferCache.clear();
                     resolve();
                     return;
@@ -659,7 +693,8 @@ export class MidyGM2 {
                 else if (this.isStopping) {
                     await this.stopNotes(0, true, now);
                     this.notePromises = [];
-                    this.exclusiveClassMap.clear();
+                    this.exclusiveClassNotes.fill(undefined);
+                    this.drumExclusiveClassNotes.fill(undefined);
                     this.audioBufferCache.clear();
                     resolve();
                     this.isStopping = false;
@@ -668,7 +703,8 @@ export class MidyGM2 {
                 }
                 else if (this.isSeeking) {
                     this.stopNotes(0, true, now);
-                    this.exclusiveClassMap.clear();
+                    this.exclusiveClassNotes.fill(undefined);
+                    this.drumExclusiveClassNotes.fill(undefined);
                     this.startTime = this.audioContext.currentTime;
                     queueIndex = this.getQueueIndex(this.resumeTime);
                     offset = this.resumeTime - this.startTime;
@@ -696,7 +732,7 @@ export class MidyGM2 {
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
-        const tmpChannels = new Array(16);
+        const tmpChannels = new Array(this.channels.length);
         for (let i = 0; i < tmpChannels.length; i++) {
             tmpChannels[i] = {
                 programNumber: -1,
@@ -795,6 +831,17 @@ export class MidyGM2 {
         }
         return { instruments, timeline };
     }
+    stopActiveNotes(channelNumber, velocity, force, scheduleTime) {
+        const channel = this.channels[channelNumber];
+        const promises = [];
+        const activeNotes = this.getActiveNotes(channel, scheduleTime);
+        activeNotes.forEach((note) => {
+            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force, undefined);
+            this.notePromises.push(promise);
+            promises.push(promise);
+        });
+        return Promise.all(promises);
+    }
     stopChannelNotes(channelNumber, velocity, force, scheduleTime) {
         const channel = this.channels[channelNumber];
         const promises = [];
@@ -824,6 +871,9 @@ export class MidyGM2 {
         if (!this.isPlaying)
             return;
         this.isStopping = true;
+        for (let i = 0; i < this.channels.length; i++) {
+            this.resetAllStates(i);
+        }
     }
     pause() {
         if (!this.isPlaying || this.isPaused)
@@ -863,6 +913,8 @@ export class MidyGM2 {
                 const note = noteList[i];
                 if (!note)
                     continue;
+                if (note.ending)
+                    continue;
                 callback(note);
             }
         });
@@ -1194,8 +1246,8 @@ export class MidyGM2 {
         note.vibratoLFO.connect(note.vibratoDepth);
         note.vibratoDepth.connect(note.bufferSource.detune);
     }
-    async getAudioBuffer(program, noteNumber, velocity, voiceParams, isSF3) {
-        const audioBufferId = this.getAudioBufferId(program, noteNumber, velocity);
+    async getAudioBuffer(programNumber, noteNumber, velocity, voiceParams, isSF3) {
+        const audioBufferId = this.getAudioBufferId(programNumber, noteNumber, velocity);
         const cache = this.audioBufferCache.get(audioBufferId);
         if (cache) {
             cache.counter += 1;
@@ -1218,8 +1270,8 @@ export class MidyGM2 {
         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.program, noteNumber, velocity, voiceParams, isSF3);
-        note.bufferSource = this.createBufferSource(channel, note, voiceParams, audioBuffer);
+        const audioBuffer = await this.getAudioBuffer(channel.programNumber, noteNumber, velocity, voiceParams, isSF3);
+        note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
         note.volumeNode = new GainNode(this.audioContext);
         note.gainL = new GainNode(this.audioContext);
         note.gainR = new GainNode(this.audioContext);
@@ -1228,7 +1280,7 @@ export class MidyGM2 {
             type: "lowpass",
             Q: voiceParams.initialFilterQ / 10, // dB
         });
-        if (portamento) {
+        if (0.5 <= state.portamento && portamento) {
             note.portamento = true;
             this.setPortamentoStartVolumeEnvelope(channel, note, now);
             this.setPortamentoStartFilterEnvelope(channel, note, now);
@@ -1279,14 +1331,56 @@ export class MidyGM2 {
                 return channel.bank;
         }
     }
+    handleExclusiveClass(note, channelNumber, startTime) {
+        const exclusiveClass = note.voiceParams.exclusiveClass;
+        if (exclusiveClass === 0)
+            return;
+        const prev = this.exclusiveClassNotes[exclusiveClass];
+        if (prev) {
+            const [prevNote, prevChannelNumber] = prev;
+            if (prevNote && !prevNote.ending) {
+                this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
+                startTime, true, // force
+                undefined);
+            }
+        }
+        this.exclusiveClassNotes[exclusiveClass] = [note, channelNumber];
+    }
+    handleDrumExclusiveClass(note, channelNumber, startTime) {
+        const channel = this.channels[channelNumber];
+        if (!channel.isDrum)
+            return;
+        const kitTable = drumExclusiveClassesByKit[channel.programNumber];
+        if (!kitTable)
+            return;
+        const drumExclusiveClass = kitTable[note.noteNumber];
+        if (drumExclusiveClass === 0)
+            return;
+        const index = (drumExclusiveClass - 1) * this.channels.length +
+            channelNumber;
+        const prevNote = this.drumExclusiveClassNotes[index];
+        if (prevNote && !prevNote.ending) {
+            this.scheduleNoteOff(channelNumber, prevNote.noteNumber, 0, // velocity,
+            startTime, true, // force
+            undefined);
+        }
+        this.drumExclusiveClassNotes[index] = note;
+    }
+    isDrumNoteOffException(channel, noteNumber) {
+        if (!channel.isDrum)
+            return false;
+        const programNumber = channel.programNumber;
+        return !((programNumber === 48 && noteNumber === 88) ||
+            (programNumber === 56 && 47 <= noteNumber && noteNumber <= 84));
+    }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, portamento) {
         const channel = this.channels[channelNumber];
         const bankNumber = this.calcBank(channel, channelNumber);
-        const soundFontIndex = this.soundFontTable[channel.program].get(bankNumber);
+        const soundFontIndex = this.soundFontTable[channel.programNumber].get(bankNumber);
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.program, noteNumber, velocity);
+        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
         if (!voice)
             return;
         const isSF3 = soundFont.parsed.info.version.major === 3;
@@ -1296,33 +1390,60 @@ export class MidyGM2 {
         if (0.5 <= channel.state.sustainPedal) {
             channel.sustainNotes.push(note);
         }
-        const exclusiveClass = note.voiceParams.exclusiveClass;
-        if (exclusiveClass !== 0) {
-            if (this.exclusiveClassMap.has(exclusiveClass)) {
-                const prevEntry = this.exclusiveClassMap.get(exclusiveClass);
-                const [prevNote, prevChannelNumber] = prevEntry;
-                if (prevNote && !prevNote.ending) {
-                    this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
-                    startTime, true, // force
-                    undefined);
-                }
-            }
-            this.exclusiveClassMap.set(exclusiveClass, [note, channelNumber]);
-        }
+        this.handleExclusiveClass(note, channelNumber, startTime);
+        this.handleDrumExclusiveClass(note, channelNumber, startTime);
         const scheduledNotes = channel.scheduledNotes;
-        if (scheduledNotes.has(noteNumber)) {
-            scheduledNotes.get(noteNumber).push(note);
+        let noteList = scheduledNotes.get(noteNumber);
+        if (noteList) {
+            noteList.push(note);
         }
         else {
-            scheduledNotes.set(noteNumber, [note]);
+            noteList = [note];
+            scheduledNotes.set(noteNumber, noteList);
+        }
+        if (this.isDrumNoteOffException(channel, noteNumber)) {
+            const stopTime = startTime + note.bufferSource.buffer.duration;
+            const index = noteList.length - 1;
+            const promise = new Promise((resolve) => {
+                note.bufferSource.onended = () => {
+                    noteList[index] = undefined;
+                    this.disconnectNote(note);
+                    resolve();
+                };
+                note.bufferSource.stop(stopTime);
+            });
+            this.notePromises.push(promise);
         }
     }
     noteOn(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, scheduleTime, false);
     }
-    stopNote(endTime, stopTime, scheduledNotes, index) {
-        const note = scheduledNotes[index];
+    disconnectNote(note) {
+        note.bufferSource.disconnect();
+        note.filterNode.disconnect();
+        note.volumeEnvelopeNode.disconnect();
+        note.volumeNode.disconnect();
+        note.gainL.disconnect();
+        note.gainR.disconnect();
+        if (note.modulationDepth) {
+            note.volumeDepth.disconnect();
+            note.modulationDepth.disconnect();
+            note.modulationLFO.stop();
+        }
+        if (note.vibratoDepth) {
+            note.vibratoDepth.disconnect();
+            note.vibratoLFO.stop();
+        }
+        if (note.reverbEffectsSend) {
+            note.reverbEffectsSend.disconnect();
+        }
+        if (note.chorusEffectsSend) {
+            note.chorusEffectsSend.disconnect();
+        }
+    }
+    stopNote(endTime, stopTime, noteList, index) {
+        const note = noteList[index];
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
             .linearRampToValueAtTime(0, stopTime);
@@ -1332,35 +1453,27 @@ export class MidyGM2 {
         }, stopTime);
         return new Promise((resolve) => {
             note.bufferSource.onended = () => {
-                scheduledNotes[index] = null;
-                note.bufferSource.disconnect();
-                note.filterNode.disconnect();
-                note.volumeEnvelopeNode.disconnect();
-                note.volumeNode.disconnect();
-                note.gainL.disconnect();
-                note.gainR.disconnect();
-                if (note.modulationDepth) {
-                    note.volumeDepth.disconnect();
-                    note.modulationDepth.disconnect();
-                    note.modulationLFO.stop();
-                }
-                if (note.vibratoDepth) {
-                    note.vibratoDepth.disconnect();
-                    note.vibratoLFO.stop();
-                }
-                if (note.reverbEffectsSend) {
-                    note.reverbEffectsSend.disconnect();
-                }
-                if (note.chorusEffectsSend) {
-                    note.chorusEffectsSend.disconnect();
-                }
+                noteList[index] = undefined;
+                this.disconnectNote(note);
                 resolve();
             };
             note.bufferSource.stop(stopTime);
         });
     }
+    findNoteOffTarget(noteList) {
+        for (let i = 0; i < noteList.length; i++) {
+            const note = noteList[i];
+            if (!note)
+                continue;
+            if (note.ending)
+                continue;
+            return [note, i];
+        }
+    }
     scheduleNoteOff(channelNumber, noteNumber, _velocity, endTime, force, portamentoNoteNumber) {
         const channel = this.channels[channelNumber];
+        if (this.isDrumNoteOffException(channel, noteNumber))
+            return;
         const state = channel.state;
         if (!force) {
             if (0.5 <= state.sustainPedal)
@@ -1368,34 +1481,32 @@ export class MidyGM2 {
             if (channel.sostenutoNotes.has(noteNumber))
                 return;
         }
-        if (!channel.scheduledNotes.has(noteNumber))
+        const noteList = channel.scheduledNotes.get(noteNumber);
+        if (!noteList)
+            return; // be careful with drum channel
+        const noteOffTarget = this.findNoteOffTarget(noteList, endTime);
+        if (!noteOffTarget)
             return;
-        const scheduledNotes = channel.scheduledNotes.get(noteNumber);
-        for (let i = 0; i < scheduledNotes.length; i++) {
-            const note = scheduledNotes[i];
-            if (!note)
-                continue;
-            if (note.ending)
-                continue;
-            if (portamentoNoteNumber === undefined) {
-                const volRelease = endTime + note.voiceParams.volRelease;
-                const modRelease = endTime + note.voiceParams.modRelease;
-                note.filterNode.frequency
-                    .cancelScheduledValues(endTime)
-                    .linearRampToValueAtTime(0, modRelease);
-                const stopTime = Math.min(volRelease, modRelease);
-                return this.stopNote(endTime, stopTime, scheduledNotes, i);
-            }
-            else {
-                const portamentoTime = endTime + this.getPortamentoTime(channel);
-                const deltaNote = portamentoNoteNumber - noteNumber;
-                const baseRate = note.voiceParams.playbackRate;
-                const targetRate = baseRate * Math.pow(2, deltaNote / 12);
-                note.bufferSource.playbackRate
-                    .cancelScheduledValues(endTime)
-                    .linearRampToValueAtTime(targetRate, portamentoTime);
-                return this.stopNote(endTime, portamentoTime, scheduledNotes, i);
-            }
+        const [note, i] = noteOffTarget;
+        if (0.5 <= state.portamento && portamentoNoteNumber !== undefined) {
+            const portamentoTime = endTime + this.getPortamentoTime(channel);
+            const deltaNote = portamentoNoteNumber - noteNumber;
+            const baseRate = note.voiceParams.playbackRate;
+            const targetRate = baseRate * Math.pow(2, deltaNote / 12);
+            note.bufferSource.playbackRate
+                .cancelScheduledValues(endTime)
+                .linearRampToValueAtTime(targetRate, portamentoTime);
+            return this.stopNote(endTime, portamentoTime, noteList, i);
+        }
+        else {
+            const volRelease = endTime +
+                note.voiceParams.volRelease * state.releaseTime * 2;
+            const modRelease = endTime + note.voiceParams.modRelease;
+            note.filterNode.frequency
+                .cancelScheduledValues(endTime)
+                .linearRampToValueAtTime(0, modRelease);
+            const stopTime = Math.min(volRelease, modRelease);
+            return this.stopNote(endTime, stopTime, noteList, i);
         }
     }
     noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
@@ -1446,10 +1557,10 @@ export class MidyGM2 {
                 console.warn(`Unsupported MIDI message: ${messageType.toString(16)}`);
         }
     }
-    handleProgramChange(channelNumber, program, _scheduleTime) {
+    handleProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.bank = channel.bankMSB * 128 + channel.bankLSB;
-        channel.program = program;
+        channel.programNumber = programNumber;
         if (this.mode === "GM2") {
             switch (channel.bankMSB) {
                 case 120:
@@ -1476,7 +1587,7 @@ export class MidyGM2 {
         this.getActiveNotes(channel, scheduleTime).forEach((note) => {
             this.setControllerParameters(channel, note, table);
         });
-        // this.applyVoiceParams(channel, 13);
+        this.applyVoiceParams(channel, 13);
     }
     handlePitchBendMessage(channelNumber, lsb, msb, scheduleTime) {
         const pitchBend = msb * 128 + lsb;
@@ -1653,6 +1764,7 @@ export class MidyGM2 {
         state.set(channel.state.array);
         state[2] = velocity / 127;
         state[3] = noteNumber / 127;
+        state[13] = state.channelPressure / 127;
         return state;
     }
     applyVoiceParams(channel, controllerType, scheduleTime) {
@@ -1679,7 +1791,7 @@ export class MidyGM2 {
                         if (key in voiceParams)
                             noteVoiceParams[key] = voiceParams[key];
                     }
-                    if (note.portamento) {
+                    if (0.5 <= channel.state.portamento && note.portamento) {
                         this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
                     }
                     else {
@@ -1876,10 +1988,11 @@ export class MidyGM2 {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
+        const state = channel.state;
         scheduleTime ??= this.audioContext.currentTime;
-        channel.state.softPedal = softPedal / 127;
+        state.softPedal = softPedal / 127;
         this.processScheduledNotes(channel, (note) => {
-            if (note.portamento) {
+            if (0.5 <= state.portamento && note.portamento) {
                 this.setPortamentoStartVolumeEnvelope(channel, note, scheduleTime);
                 this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
             }
@@ -2078,18 +2191,32 @@ export class MidyGM2 {
     }
     allSoundOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        return this.stopChannelNotes(channelNumber, 0, true, scheduleTime);
+        return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
+    resetAllStates(channelNumber) {
+        const channel = this.channels[channelNumber];
+        const state = channel.state;
+        for (const type of Object.keys(defaultControllerState)) {
+            state[type] = defaultControllerState[type].defaultValue;
+        }
+        for (const type of Object.keys(this.constructor.channelSettings)) {
+            channel[type] = this.constructor.channelSettings[type];
+        }
+        this.mode = "GM2";
+        this.masterFineTuning = 0; // cb
+        this.masterCoarseTuning = 0; // cb
+    }
+    // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp15.pdf
     resetAllControllers(channelNumber) {
         const stateTypes = [
+            "channelPressure",
+            "pitchWheel",
             "expression",
             "modulationDepth",
             "sustainPedal",
             "portamento",
             "sostenutoPedal",
             "softPedal",
-            "channelPressure",
-            "pitchWheelSensitivity",
         ];
         const channel = this.channels[channelNumber];
         const state = channel.state;
@@ -2108,7 +2235,7 @@ export class MidyGM2 {
     }
     allNotesOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        return this.stopChannelNotes(channelNumber, 0, false, scheduleTime);
+        return this.stopActiveNotes(channelNumber, 0, false, scheduleTime);
     }
     omniOff(channelNumber, value, scheduleTime) {
         this.allNotesOff(channelNumber, value, scheduleTime);
@@ -2454,7 +2581,7 @@ export class MidyGM2 {
         return value * 0.00787;
     }
     getChannelBitmap(data) {
-        const bitmap = new Array(16).fill(false);
+        const bitmap = new Array(this.channels.length).fill(false);
         const ff = data[4] & 0b11;
         const gg = data[5] & 0x7F;
         const hh = data[6] & 0x7F;
@@ -2596,6 +2723,7 @@ export class MidyGM2 {
                 console.warn(`Unsupported Exclusive Message: ${data}`);
         }
     }
+    // https://github.com/marmooo/js-timer-benchmark
     scheduleTask(callback, scheduleTime) {
         return new Promise((resolve) => {
             const bufferSource = new AudioBufferSourceNode(this.audioContext, {
@@ -2620,10 +2748,8 @@ Object.defineProperty(MidyGM2, "channelSettings", {
     configurable: true,
     writable: true,
     value: {
-        currentBufferSource: null,
-        isDrum: false,
         detune: 0,
-        program: 0,
+        programNumber: 0,
         bank: 121 * 128,
         bankMSB: 121,
         bankLSB: 0,