@marmooo/midy 0.2.8 → 0.2.9

package/esm/midy.d.ts

@@ -1,6 +1,7 @@
 export class Midy {
     static channelSettings: {
         currentBufferSource: null;
+        isDrum: boolean;
         detune: number;
         program: number;
         bank: number;
@@ -11,9 +12,9 @@ export class Midy {
         rpnMSB: number;
         rpnLSB: number;
         mono: boolean;
+        modulationDepthRange: number;
         fineTuning: number;
         coarseTuning: number;
-        modulationDepthRange: number;
     };
     constructor(audioContext: any, options?: {
         reverbAlgorithm: (audioContext: any) => {
@@ -21,6 +22,7 @@ export class Midy {
             output: any;
         };
     });
+    mode: string;
     ticksPerBeat: number;
     totalTime: number;
     masterFineTuning: number;
@@ -68,6 +70,8 @@ export class Midy {
         };
     };
     masterVolume: any;
+    scheduler: any;
+    schedulerBuffer: any;
     voiceParamsHandlers: {
         modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
         vibLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
@@ -93,7 +97,7 @@ export class Midy {
         64: (channelNumber: any, value: any, scheduleTime: any) => void;
         65: (channelNumber: any, value: any) => void;
         66: (channelNumber: any, value: any, scheduleTime: any) => void;
-        67: (channelNumber: any, softPedal: any, _scheduleTime: any) => void;
+        67: (channelNumber: any, softPedal: any, scheduleTime: any) => void;
         71: (channelNumber: any, filterResonance: any, scheduleTime: any) => void;
         72: (channelNumber: any, releaseTime: any, _scheduleTime: any) => void;
         73: (channelNumber: any, attackTime: any, scheduleTime: any) => void;
@@ -141,7 +145,8 @@ export class Midy {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(audioBuffer: any, voiceParams: any): any;
+    calcLoopMode(channel: any, note: any, voiceParams: any): boolean;
+    createBufferSource(channel: any, note: any, voiceParams: any, audioBuffer: any): any;
     findPortamentoTarget(queueIndex: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
@@ -206,7 +211,7 @@ export class Midy {
     startVibrato(channel: any, note: any, scheduleTime: any): void;
     getAudioBuffer(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, portamento: any, isSF3: any): Promise<Note>;
-    calcBank(channel: any, channelNumber: any): any;
+    calcBank(channel: any): any;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any, portamento: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<void>;
     stopNote(endTime: any, stopTime: any, scheduledNotes: any, index: any): Promise<any>;
@@ -256,7 +261,7 @@ export class Midy {
         64: (channelNumber: any, value: any, scheduleTime: any) => void;
         65: (channelNumber: any, value: any) => void;
         66: (channelNumber: any, value: any, scheduleTime: any) => void;
-        67: (channelNumber: any, softPedal: any, _scheduleTime: any) => void;
+        67: (channelNumber: any, softPedal: any, scheduleTime: any) => void;
         71: (channelNumber: any, filterResonance: any, scheduleTime: any) => void;
         72: (channelNumber: any, releaseTime: any, _scheduleTime: any) => void;
         73: (channelNumber: any, attackTime: any, scheduleTime: any) => void;
@@ -299,7 +304,7 @@ export class Midy {
     setSustainPedal(channelNumber: any, value: any, scheduleTime: any): void;
     setPortamento(channelNumber: any, value: any): void;
     setSostenutoPedal(channelNumber: any, value: any, scheduleTime: any): void;
-    setSoftPedal(channelNumber: any, softPedal: any, _scheduleTime: any): void;
+    setSoftPedal(channelNumber: any, softPedal: any, scheduleTime: any): void;
     setFilterResonance(channelNumber: any, filterResonance: any, scheduleTime: any): void;
     setReleaseTime(channelNumber: any, releaseTime: any, _scheduleTime: any): void;
     setAttackTime(channelNumber: any, attackTime: any, scheduleTime: any): void;
@@ -334,8 +339,8 @@ export class Midy {
     monoOn(channelNumber: any, value: any, scheduleTime: any): void;
     polyOn(channelNumber: any, value: any, scheduleTime: any): void;
     handleUniversalNonRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
-    GM1SystemOn(): void;
-    GM2SystemOn(): void;
+    GM1SystemOn(scheduleTime: any): void;
+    GM2SystemOn(scheduleTime: any): void;
     handleUniversalRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
     handleMasterVolumeSysEx(data: any, scheduleTime: any): void;
     setMasterVolume(volume: any, scheduleTime: any): void;

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}

package/esm/midy.js

@@ -246,6 +246,12 @@ const volumeEnvelopeKeys = [
 const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
 export class Midy {
     constructor(audioContext, options = this.defaultOptions) {
+        Object.defineProperty(this, "mode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "GM2"
+        });
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -424,6 +430,11 @@ export class Midy {
         this.audioContext = audioContext;
         this.options = { ...this.defaultOptions, ...options };
         this.masterVolume = new GainNode(audioContext);
+        this.scheduler = new GainNode(audioContext, { gain: 0 });
+        this.schedulerBuffer = new AudioBuffer({
+            length: 1,
+            sampleRate: audioContext.sampleRate,
+        });
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
@@ -432,6 +443,7 @@ export class Midy {
         this.chorusEffect.output.connect(this.masterVolume);
         this.reverbEffect.output.connect(this.masterVolume);
         this.masterVolume.connect(audioContext.destination);
+        this.scheduler.connect(audioContext.destination);
         this.GM2SystemOn();
     }
     initSoundFontTable() {
@@ -531,10 +543,24 @@ export class Midy {
             return audioBuffer;
         }
     }
-    createNoteBufferNode(audioBuffer, voiceParams) {
+    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) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
-        bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
+        bufferSource.loop = this.calcLoopMode(channel, note, voiceParams);
         if (bufferSource.loop) {
             bufferSource.loopStart = voiceParams.loopStart / voiceParams.sampleRate;
             bufferSource.loopEnd = voiceParams.loopEnd / voiceParams.sampleRate;
@@ -1014,7 +1040,9 @@ export class Midy {
         return 8.176 * this.centToRate(cent);
     }
     calcChannelDetune(channel) {
-        const masterTuning = this.masterCoarseTuning + this.masterFineTuning;
+        const masterTuning = channel.isDrum
+            ? 0
+            : this.masterCoarseTuning + this.masterFineTuning;
         const channelTuning = channel.coarseTuning + channel.fineTuning;
         const tuning = masterTuning + channelTuning;
         const pitchWheel = channel.state.pitchWheel * 2 - 1;
@@ -1041,9 +1069,8 @@ export class Midy {
             .setValueAtTime(detune, scheduleTime);
     }
     getPortamentoTime(channel) {
-        const factor = 5 * Math.log(10) / 127;
-        const time = channel.state.portamentoTime;
-        return Math.log(time) / factor;
+        const factor = 5 * Math.log(10) * 127;
+        return channel.state.portamentoTime * factor;
     }
     setPortamentoStartVolumeEnvelope(channel, note, scheduleTime) {
         const { voiceParams, startTime } = note;
@@ -1207,7 +1234,7 @@ export class Midy {
         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.createNoteBufferNode(audioBuffer, voiceParams);
+        note.bufferSource = this.createBufferSource(channel, note, voiceParams, audioBuffer);
         note.volumeNode = new GainNode(this.audioContext);
         note.gainL = new GainNode(this.audioContext);
         note.gainR = new GainNode(this.audioContext);
@@ -1251,14 +1278,21 @@ export class Midy {
         note.bufferSource.start(startTime);
         return note;
     }
-    calcBank(channel, channelNumber) {
-        if (channel.bankMSB === 121) {
-            return 0;
-        }
-        if (channelNumber % 9 <= 1 && channel.bankMSB === 120) {
-            return 128;
+    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;
         }
-        return channel.bank;
     }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, portamento) {
         const channel = this.channels[channelNumber];
@@ -1282,7 +1316,7 @@ export class Midy {
             if (this.exclusiveClassMap.has(exclusiveClass)) {
                 const prevEntry = this.exclusiveClassMap.get(exclusiveClass);
                 const [prevNote, prevChannelNumber] = prevEntry;
-                if (!prevNote.ending) {
+                if (prevNote && !prevNote.ending) {
                     this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
                     startTime, true, // force
                     undefined);
@@ -1445,9 +1479,21 @@ export class Midy {
         const channel = this.channels[channelNumber];
         channel.bank = channel.bankMSB * 128 + channel.bankLSB;
         channel.program = program;
+        if (this.mode === "GM2") {
+            switch (channel.bankMSB) {
+                case 120:
+                    channel.isDrum = true;
+                    break;
+                case 121:
+                    channel.isDrum = false;
+                    break;
+            }
+        }
     }
     handleChannelPressure(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
         const prev = channel.state.channelPressure;
         const next = value / 127;
         channel.state.channelPressure = next;
@@ -1466,8 +1512,10 @@ export class Midy {
         this.setPitchBend(channelNumber, pitchBend, scheduleTime);
     }
     setPitchBend(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheel * 2 - 1;
         const next = (value - 8192) / 8192;
@@ -1749,15 +1797,16 @@ export class Midy {
         });
     }
     setModulationDepth(channelNumber, modulation, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.modulationDepth = modulation / 127;
         this.updateModulation(channel, scheduleTime);
     }
     setPortamentoTime(channelNumber, portamentoTime) {
         const channel = this.channels[channelNumber];
-        const factor = 5 * Math.log(10) / 127;
-        channel.state.portamentoTime = Math.exp(factor * portamentoTime);
+        channel.state.portamentoTime = portamentoTime / 127;
     }
     setKeyBasedVolume(channel, scheduleTime) {
         this.processScheduledNotes(channel, (note) => {
@@ -1829,8 +1878,10 @@ export class Midy {
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
             this.processScheduledNotes(channel, (note) => {
@@ -1842,11 +1893,16 @@ export class Midy {
         }
     }
     setPortamento(channelNumber, value) {
-        this.channels[channelNumber].state.portamento = value / 127;
+        const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        channel.state.portamento = value / 127;
     }
     setSostenutoPedal(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.sostenutoPedal = value / 127;
         if (64 <= value) {
             channel.sostenutoNotes = this.getActiveNotes(channel, scheduleTime);
@@ -1855,13 +1911,28 @@ export class Midy {
             this.releaseSostenutoPedal(channelNumber, value, scheduleTime);
         }
     }
-    setSoftPedal(channelNumber, softPedal, _scheduleTime) {
+    setSoftPedal(channelNumber, softPedal, scheduleTime) {
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.softPedal = softPedal / 127;
+        this.processScheduledNotes(channel, (note) => {
+            if (note.portamento) {
+                this.setPortamentoStartVolumeEnvelope(channel, note, scheduleTime);
+                this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
+            }
+            else {
+                this.setVolumeEnvelope(channel, note, scheduleTime);
+                this.setFilterEnvelope(channel, note, scheduleTime);
+            }
+        });
     }
     setFilterResonance(channelNumber, filterResonance, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         state.filterResonance = filterResonance / 64;
         this.processScheduledNotes(channel, (note) => {
@@ -1870,13 +1941,17 @@ export class Midy {
         });
     }
     setReleaseTime(channelNumber, releaseTime, _scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.releaseTime = releaseTime / 64;
     }
     setAttackTime(channelNumber, attackTime, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.attackTime = attackTime / 64;
         this.processScheduledNotes(channel, (note) => {
             if (note.startTime < scheduleTime)
@@ -1885,8 +1960,10 @@ export class Midy {
         });
     }
     setBrightness(channelNumber, brightness, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.brightness = brightness / 64;
         this.processScheduledNotes(channel, (note) => {
             if (note.portamento) {
@@ -1898,16 +1975,20 @@ export class Midy {
         });
     }
     setDecayTime(channelNumber, dacayTime, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.decayTime = dacayTime / 64;
         this.processScheduledNotes(channel, (note) => {
             this.setVolumeEnvelope(channel, note, scheduleTime);
         });
     }
     setVibratoRate(channelNumber, vibratoRate, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.vibratoRate = vibratoRate / 64;
         if (channel.vibratoDepth <= 0)
             return;
@@ -1916,8 +1997,10 @@ export class Midy {
         });
     }
     setVibratoDepth(channelNumber, vibratoDepth, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.state.vibratoDepth;
         channel.state.vibratoDepth = vibratoDepth / 64;
         if (0 < prev) {
@@ -1932,8 +2015,10 @@ export class Midy {
         }
     }
     setVibratoDelay(channelNumber, vibratoDelay) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.vibratoDelay = vibratoDelay / 64;
         if (0 < channel.state.vibratoDepth) {
             this.processScheduledNotes(channel, (note) => {
@@ -2080,8 +2165,10 @@ export class Midy {
         this.setPitchBendRange(channelNumber, pitchBendRange, scheduleTime);
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
         const next = value / 128;
@@ -2097,8 +2184,10 @@ export class Midy {
         this.setFineTuning(channelNumber, fineTuning, scheduleTime);
     }
     setFineTuning(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.fineTuning;
         const next = (value - 8192) / 8.192; // cent
         channel.fineTuning = next;
@@ -2112,8 +2201,10 @@ export class Midy {
         this.setCoarseTuning(channelNumber, coarseTuning, scheduleTime);
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.coarseTuning;
         const next = (value - 64) * 100; // cent
         channel.coarseTuning = next;
@@ -2127,8 +2218,10 @@ export class Midy {
         this.setModulationDepthRange(channelNumber, modulationDepthRange, scheduleTime);
     }
     setModulationDepthRange(channelNumber, modulationDepthRange, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.modulationDepthRange = modulationDepthRange;
         this.updateModulation(channel, scheduleTime);
     }
@@ -2199,12 +2292,12 @@ export class Midy {
             case 9:
                 switch (data[3]) {
                     case 1:
-                        this.GM1SystemOn();
+                        this.GM1SystemOn(scheduleTime);
                         break;
                     case 2: // GM System Off
                         break;
                     case 3:
-                        this.GM2SystemOn();
+                        this.GM2SystemOn(scheduleTime);
                         break;
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
@@ -2214,25 +2307,35 @@ export class Midy {
                 console.warn(`Unsupported Exclusive Message: ${data}`);
         }
     }
-    GM1SystemOn() {
+    GM1SystemOn(scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
+        this.mode = "GM1";
         for (let i = 0; i < this.channels.length; i++) {
+            this.allSoundOff(i, 0, scheduleTime);
             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() {
+    GM2SystemOn(scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
+        this.mode = "GM2";
         for (let i = 0; i < this.channels.length; i++) {
+            this.allSoundOff(i, 0, scheduleTime);
             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) {
         switch (data[2]) {
@@ -2308,8 +2411,14 @@ export class Midy {
         const prev = this.masterFineTuning;
         const next = (value - 8192) / 8.192; // cent
         this.masterFineTuning = next;
-        channel.detune += next - prev;
-        this.updateChannelDetune(channel, scheduleTime);
+        const detuneChange = next - prev;
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
+            if (channel.isDrum)
+                continue;
+            channel.detune += detuneChange;
+            this.updateChannelDetune(channel, scheduleTime);
+        }
     }
     handleMasterCoarseTuningSysEx(data, scheduleTime) {
         const coarseTuning = data[4];
@@ -2319,8 +2428,14 @@ export class Midy {
         const prev = this.masterCoarseTuning;
         const next = (value - 64) * 100; // cent
         this.masterCoarseTuning = next;
-        channel.detune += next - prev;
-        this.updateChannelDetune(channel, scheduleTime);
+        const detuneChange = next - prev;
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
+            if (channel.isDrum)
+                continue;
+            channel.detune += detuneChange;
+            this.updateChannelDetune(channel, scheduleTime);
+        }
     }
     handleGlobalParameterControlSysEx(data, scheduleTime) {
         if (data[7] === 1) {
@@ -2532,6 +2647,8 @@ export class Midy {
             if (!channelBitmap[i])
                 continue;
             const channel = this.channels[i];
+            if (channel.isDrum)
+                continue;
             for (let j = 0; j < 12; j++) {
                 const centValue = data[j + 7] - 64;
                 channel.scaleOctaveTuningTable[j] = centValue;
@@ -2550,6 +2667,8 @@ export class Midy {
             if (!channelBitmap[i])
                 continue;
             const channel = this.channels[i];
+            if (channel.isDrum)
+                continue;
             for (let j = 0; j < 12; j++) {
                 const index = 7 + j * 2;
                 const msb = data[index] & 0x7F;
@@ -2620,7 +2739,10 @@ export class Midy {
     }
     handlePressureSysEx(data, tableName) {
         const channelNumber = data[4];
-        const table = this.channels[channelNumber][tableName];
+        const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        const table = channel[tableName];
         for (let i = 5; i < data.length - 1; i += 2) {
             const pp = data[i];
             const rr = data[i + 1];
@@ -2648,8 +2770,11 @@ export class Midy {
     }
     handleControlChangeSysEx(data) {
         const channelNumber = data[4];
+        const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
         const controllerType = data[5];
-        const table = this.channels[channelNumber].controlTable[controllerType];
+        const table = channel.controlTable[controllerType];
         for (let i = 6; i < data.length - 1; i += 2) {
             const pp = data[i];
             const rr = data[i + 1];
@@ -2663,8 +2788,11 @@ export class Midy {
     }
     handleKeyBasedInstrumentControlSysEx(data, scheduleTime) {
         const channelNumber = data[4];
+        const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
         const keyNumber = data[5];
-        const table = this.channels[channelNumber].keyBasedInstrumentControlTable;
+        const table = channel.keyBasedInstrumentControlTable;
         for (let i = 6; i < data.length - 1; i += 2) {
             const controllerType = data[i];
             const value = data[i + 1];
@@ -2685,13 +2813,20 @@ export class Midy {
     }
     scheduleTask(callback, scheduleTime) {
         return new Promise((resolve) => {
-            const bufferSource = new AudioBufferSourceNode(this.audioContext);
+            const bufferSource = new AudioBufferSourceNode(this.audioContext, {
+                buffer: this.schedulerBuffer,
+            });
+            bufferSource.connect(this.scheduler);
             bufferSource.onended = () => {
-                callback();
-                resolve();
+                try {
+                    callback();
+                }
+                finally {
+                    bufferSource.disconnect();
+                    resolve();
+                }
             };
             bufferSource.start(scheduleTime);
-            bufferSource.stop(scheduleTime);
         });
     }
 }
@@ -2701,6 +2836,7 @@ Object.defineProperty(Midy, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        isDrum: false,
         detune: 0,
         program: 0,
         bank: 121 * 128,
@@ -2711,8 +2847,8 @@ Object.defineProperty(Midy, "channelSettings", {
         rpnMSB: 127,
         rpnLSB: 127,
         mono: false, // CC#124, CC#125
+        modulationDepthRange: 50, // cent
         fineTuning: 0, // cb
         coarseTuning: 0, // cb
-        modulationDepthRange: 50, // cent
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",