@marmooo/midy 0.3.2 → 0.3.4

package/script/midy-GMLite.d.ts

@@ -53,16 +53,16 @@ export class MidyGMLite {
     channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
-    loadSoundFont(soundFontUrl: any): Promise<void>;
-    loadMIDI(midiUrl: any): Promise<void>;
-    setChannelAudioNodes(audioContext: any): {
+    loadSoundFont(input: any): Promise<void>;
+    loadMIDI(input: any): Promise<void>;
+    createChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
         merger: any;
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createBufferSource(voiceParams: any, audioBuffer: any): any;
+    createBufferSource(channel: any, voiceParams: any, audioBuffer: any): any;
     scheduleTimelineEvents(t: any, resumeTime: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
@@ -83,7 +83,7 @@ export class MidyGMLite {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    processScheduledNotes(channel: any, callback: any): void;
+    processScheduledNotes(channel: any, scheduleTime: any, callback: any): void;
     processActiveNotes(channel: any, scheduleTime: any, callback: any): void;
     cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
@@ -101,15 +101,15 @@ export class MidyGMLite {
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     handleExclusiveClass(note: any, channelNumber: any, startTime: any): void;
     handleDrumExclusiveClass(note: any, channelNumber: any, startTime: any): void;
-    scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any, noteOffEvent: any): Promise<void>;
+    scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<void>;
     disconnectNote(note: any): void;
-    stopNote(channel: any, note: any, endTime: any, stopTime: any): Promise<any>;
-    scheduleNoteOff(channelNumber: any, note: any, _velocity: any, endTime: any, force: any): Promise<any> | undefined;
+    releaseNote(channel: any, note: any, endTime: any): Promise<any>;
+    scheduleNoteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): void;
     findNoteOffTarget(channel: any, noteNumber: any): any;
-    noteOff(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<any> | undefined;
-    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
-    handleMIDIMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
+    noteOff(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): void;
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
+    handleMIDIMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<void>;
     handleProgramChange(channelNumber: any, programNumber: any, _scheduleTime: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any, scheduleTime: any): void;
     setPitchBend(channelNumber: any, value: any, scheduleTime: any): void;
@@ -168,6 +168,7 @@ export class MidyGMLite {
 declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     index: number;
+    ending: boolean;
     bufferSource: any;
     filterNode: any;
     filterDepth: any;

package/script/midy-GMLite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAmGA;IA2BE;;;;;;;;;MASE;IAEF,+BAcC;IAnDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,2BAAqC;IACrC,+BAEE;IAcA,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAaC;IAED,6DA2BC;IAED,4DASC;IAED,+EA6CC;IAED,mCAOC;IAED,0BAiEC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MAoGC;IAED,kGAgBC;IAED,mGAgBC;IAED,wEAMC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEAWC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,wCAIC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,+GA0BC;IAED,gHAyCC;IAED,0EAiBC;IAED,8EAiBC;IAED,qHAgEC;IAED,6FASC;IAED,gCASC;IAED,6EAgBC;IAED,mHAiBC;IAED,sDASC;IAED,yGAWC;IAED,4GAeC;IAED,mGA2BC;IAED,sFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EA2CC;IAED,qCAeC;IAED,kGAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AA/+CD;IAUE,0FAMC;IAfD,cAAW;IACX,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}
+{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AA0GA;IA2BE;;;;;;;;;MASE;IAEF,+BAcC;IAnDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,2BAAqC;IACrC,+BAEE;IAcA,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCAWC;IAED,yCAcC;IAED,oCAiBC;IAED;;;;MAeC;IAED,yCAaC;IAED,6DA2BC;IAED,0EAUC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAiEC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA6EC;IAED,kGAeC;IAED,mGAgBC;IAED,wEAMC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4EASC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,wCAIC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,+GA0BC;IAED,gHA6CC;IAED,0EAiBC;IAED,8EAiBC;IAED,kGAuCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAgBC;IAED,sDASC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,sFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;IAED,qCAeC;IAED,kGAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAp9CD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GMLite.js

@@ -11,6 +11,12 @@ class Note {
             writable: true,
             value: -1
         });
+        Object.defineProperty(this, "ending", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "bufferSource", {
             enumerable: true,
             configurable: true,
@@ -80,13 +86,11 @@ const defaultControllerState = {
     pitchWheel: { type: 14, defaultValue: 8192 / 16383 },
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
     link: { type: 127, defaultValue: 0 },
-    // bankMSB: { type: 128 + 0, defaultValue: 121, },
     modulationDepth: { type: 128 + 1, defaultValue: 0 },
     // dataMSB: { type: 128 + 6, defaultValue: 0, },
     volume: { type: 128 + 7, defaultValue: 100 / 127 },
     pan: { type: 128 + 10, defaultValue: 64 / 127 },
     expression: { type: 128 + 11, defaultValue: 1 },
-    // bankLSB: { type: 128 + 32, defaultValue: 0, },
     // dataLSB: { type: 128 + 38, defaultValue: 0, },
     sustainPedal: { type: 128 + 64, defaultValue: 0 },
     // rpnLSB: { type: 128 + 100, defaultValue: 127 },
@@ -115,6 +119,16 @@ class ControllerState {
         }
     }
 }
+const volumeEnvelopeKeys = [
+    "volDelay",
+    "volAttack",
+    "volHold",
+    "volDecay",
+    "volSustain",
+    "volRelease",
+    "initialAttenuation",
+];
+const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
 const filterEnvelopeKeys = [
     "modEnvToPitch",
     "initialFilterFc",
@@ -124,20 +138,18 @@ const filterEnvelopeKeys = [
     "modHold",
     "modDecay",
     "modSustain",
-    "modRelease",
-    "playbackRate",
 ];
 const filterEnvelopeKeySet = new Set(filterEnvelopeKeys);
-const volumeEnvelopeKeys = [
-    "volDelay",
-    "volAttack",
-    "volHold",
-    "volDecay",
-    "volSustain",
-    "volRelease",
-    "initialAttenuation",
+const pitchEnvelopeKeys = [
+    "modEnvToPitch",
+    "modDelay",
+    "modAttack",
+    "modHold",
+    "modDecay",
+    "modSustain",
+    "playbackRate",
 ];
-const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
+const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
 class MidyGMLite {
     constructor(audioContext) {
         Object.defineProperty(this, "mode", {
@@ -311,24 +323,44 @@ class MidyGMLite {
             }
         }
     }
-    async loadSoundFont(soundFontUrl) {
-        const response = await fetch(soundFontUrl);
-        const arrayBuffer = await response.arrayBuffer();
-        const parsed = (0, soundfont_parser_1.parse)(new Uint8Array(arrayBuffer));
+    async loadSoundFont(input) {
+        let uint8Array;
+        if (typeof input === "string") {
+            const response = await fetch(input);
+            const arrayBuffer = await response.arrayBuffer();
+            uint8Array = new Uint8Array(arrayBuffer);
+        }
+        else if (input instanceof Uint8Array) {
+            uint8Array = input;
+        }
+        else {
+            throw new TypeError("input must be a URL string or Uint8Array");
+        }
+        const parsed = (0, soundfont_parser_1.parse)(uint8Array);
         const soundFont = new soundfont_parser_1.SoundFont(parsed);
         this.addSoundFont(soundFont);
     }
-    async loadMIDI(midiUrl) {
-        const response = await fetch(midiUrl);
-        const arrayBuffer = await response.arrayBuffer();
-        const midi = (0, midi_file_1.parseMidi)(new Uint8Array(arrayBuffer));
+    async loadMIDI(input) {
+        let uint8Array;
+        if (typeof input === "string") {
+            const response = await fetch(input);
+            const arrayBuffer = await response.arrayBuffer();
+            uint8Array = new Uint8Array(arrayBuffer);
+        }
+        else if (input instanceof Uint8Array) {
+            uint8Array = input;
+        }
+        else {
+            throw new TypeError("input must be a URL string or Uint8Array");
+        }
+        const midi = (0, midi_file_1.parseMidi)(uint8Array);
         this.ticksPerBeat = midi.header.ticksPerBeat;
         const midiData = this.extractMidiData(midi);
         this.instruments = midiData.instruments;
         this.timeline = midiData.timeline;
         this.totalTime = this.calcTotalTime();
     }
-    setChannelAudioNodes(audioContext) {
+    createChannelAudioNodes(audioContext) {
         const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
@@ -349,7 +381,7 @@ class MidyGMLite {
                 isDrum: false,
                 state: new ControllerState(),
                 ...this.constructor.channelSettings,
-                ...this.setChannelAudioNodes(audioContext),
+                ...this.createChannelAudioNodes(audioContext),
                 scheduledNotes: [],
                 sustainNotes: [],
             };
@@ -385,10 +417,12 @@ class MidyGMLite {
             return audioBuffer;
         }
     }
-    createBufferSource(voiceParams, audioBuffer) {
+    createBufferSource(channel, voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
         bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
+        if (channel.isDrum)
+            bufferSource.loop = false;
         if (bufferSource.loop) {
             bufferSource.loopStart = voiceParams.loopStart / voiceParams.sampleRate;
             bufferSource.loopEnd = voiceParams.loopEnd / voiceParams.sampleRate;
@@ -403,12 +437,13 @@ class MidyGMLite {
             const delay = this.startDelay - resumeTime;
             const startTime = event.startTime + delay;
             switch (event.type) {
-                case "noteOn": {
-                    const noteOffEvent = {
-                        ...event.noteOffEvent,
-                        startTime: event.noteOffEvent.startTime + delay,
-                    };
-                    await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime, noteOffEvent);
+                case "noteOn":
+                    await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime);
+                    break;
+                case "noteOff": {
+                    const notePromise = this.scheduleNoteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
+                    if (notePromise)
+                        this.notePromises.push(notePromise);
                     break;
                 }
                 case "controller":
@@ -510,6 +545,7 @@ class MidyGMLite {
         return `${programNumber}:${noteNumber}:${velocity}`;
     }
     extractMidiData(midi) {
+        this.audioBufferCounter.clear();
         const instruments = new Set();
         const timeline = [];
         const tmpChannels = new Array(this.channels.length);
@@ -573,38 +609,13 @@ class MidyGMLite {
                 prevTempoTicks = event.ticks;
             }
         }
-        const activeNotes = new Array(this.channels.length * 128);
-        for (let i = 0; i < activeNotes.length; i++) {
-            activeNotes[i] = [];
-        }
-        for (let i = 0; i < timeline.length; i++) {
-            const event = timeline[i];
-            switch (event.type) {
-                case "noteOn": {
-                    const index = event.channel * 128 + event.noteNumber;
-                    activeNotes[index].push(event);
-                    break;
-                }
-                case "noteOff": {
-                    const index = event.channel * 128 + event.noteNumber;
-                    const noteOn = activeNotes[index].pop();
-                    if (noteOn) {
-                        noteOn.noteOffEvent = event;
-                    }
-                    else {
-                        const eventString = JSON.stringify(event, null, 2);
-                        console.warn(`noteOff without matching noteOn: ${eventString}`);
-                    }
-                }
-            }
-        }
         return { instruments, timeline };
     }
     stopActiveNotes(channelNumber, velocity, force, scheduleTime) {
         const channel = this.channels[channelNumber];
         const promises = [];
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force, undefined);
+            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
@@ -613,8 +624,8 @@ class MidyGMLite {
     stopChannelNotes(channelNumber, velocity, force, scheduleTime) {
         const channel = this.channels[channelNumber];
         const promises = [];
-        this.processScheduledNotes(channel, (note) => {
-            const promise = this.scheduleNoteOff(channelNumber, note, velocity, scheduleTime, force);
+        this.processScheduledNotes(channel, scheduleTime, (note) => {
+            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
@@ -672,7 +683,7 @@ class MidyGMLite {
         const now = this.audioContext.currentTime;
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
-    processScheduledNotes(channel, callback) {
+    processScheduledNotes(channel, scheduleTime, callback) {
         const scheduledNotes = channel.scheduledNotes;
         for (let i = 0; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
@@ -680,6 +691,8 @@ class MidyGMLite {
                 continue;
             if (note.ending)
                 continue;
+            if (note.startTime < scheduleTime)
+                continue;
             callback(note);
         }
     }
@@ -691,11 +704,8 @@ class MidyGMLite {
                 continue;
             if (note.ending)
                 continue;
-            const noteOffEvent = note.noteOffEvent;
-            if (noteOffEvent && noteOffEvent.startTime < scheduleTime)
-                continue;
             if (scheduleTime < note.startTime)
-                continue;
+                break;
             callback(note);
         }
     }
@@ -717,7 +727,7 @@ class MidyGMLite {
         return pitchWheel * pitchWheelSensitivity;
     }
     updateChannelDetune(channel, scheduleTime) {
-        this.processScheduledNotes(channel, (note) => {
+        this.processScheduledNotes(channel, scheduleTime, (note) => {
             this.updateDetune(channel, note, scheduleTime);
         });
     }
@@ -835,7 +845,7 @@ class MidyGMLite {
         const voiceParams = voice.getAllParams(controllerState);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
         const audioBuffer = await this.getAudioBuffer(channel.programNumber, noteNumber, velocity, voiceParams, isSF3);
-        note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
+        note.bufferSource = this.createBufferSource(channel, voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -861,7 +871,7 @@ class MidyGMLite {
         if (prev) {
             const [prevNote, prevChannelNumber] = prev;
             if (prevNote && !prevNote.ending) {
-                this.scheduleNoteOff(prevChannelNumber, prevNote, 0, // velocity,
+                this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
                 startTime, true);
             }
         }
@@ -877,12 +887,12 @@ class MidyGMLite {
         const index = drumExclusiveClass * this.channels.length + channelNumber;
         const prevNote = this.drumExclusiveClassNotes[index];
         if (prevNote && !prevNote.ending) {
-            this.scheduleNoteOff(channelNumber, prevNote, 0, // velocity,
+            this.scheduleNoteOff(channelNumber, prevNote.noteNumber, 0, // velocity,
             startTime, true);
         }
         this.drumExclusiveClassNotes[index] = note;
     }
-    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, noteOffEvent) {
+    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
         const bankNumber = channel.bank;
         const soundFontIndex = this.soundFontTable[channel.programNumber].get(bankNumber);
@@ -894,7 +904,6 @@ class MidyGMLite {
             return;
         const isSF3 = soundFont.parsed.info.version.major === 3;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, isSF3);
-        note.noteOffEvent = noteOffEvent;
         note.volumeEnvelopeNode.connect(channel.gainL);
         note.volumeEnvelopeNode.connect(channel.gainR);
         if (0.5 <= channel.state.sustainPedal) {
@@ -905,24 +914,6 @@ class MidyGMLite {
         const scheduledNotes = channel.scheduledNotes;
         note.index = scheduledNotes.length;
         scheduledNotes.push(note);
-        if (channel.isDrum) {
-            const stopTime = startTime + note.bufferSource.buffer.duration;
-            const promise = new Promise((resolve) => {
-                note.bufferSource.onended = () => {
-                    scheduledNotes[note.index] = undefined;
-                    this.disconnectNote(note);
-                    resolve();
-                };
-                note.bufferSource.stop(stopTime);
-            });
-            this.notePromises.push(promise);
-        }
-        else if (noteOffEvent) {
-            const notePromise = this.scheduleNoteOff(channelNumber, note, noteOffEvent.velocity, noteOffEvent.startTime, false);
-            if (notePromise) {
-                this.notePromises.push(notePromise);
-            }
-        }
     }
     noteOn(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -938,36 +929,40 @@ class MidyGMLite {
             note.modulationLFO.stop();
         }
     }
-    stopNote(channel, note, endTime, stopTime) {
+    releaseNote(channel, note, endTime) {
+        const volRelease = endTime + note.voiceParams.volRelease;
+        const modRelease = endTime + note.voiceParams.modRelease;
+        const stopTime = Math.min(volRelease, modRelease);
+        note.filterNode.frequency
+            .cancelScheduledValues(endTime)
+            .linearRampToValueAtTime(0, modRelease);
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
-            .linearRampToValueAtTime(0, stopTime);
-        note.ending = true;
-        this.scheduleTask(() => {
-            note.bufferSource.loop = false;
-        }, stopTime);
+            .linearRampToValueAtTime(0, volRelease);
         return new Promise((resolve) => {
-            note.bufferSource.onended = () => {
-                channel.scheduledNotes[note.index] = undefined;
+            this.scheduleTask(() => {
+                const bufferSource = note.bufferSource;
+                bufferSource.loop = false;
+                bufferSource.stop(stopTime);
                 this.disconnectNote(note);
+                channel.scheduledNotes[note.index] = undefined;
                 resolve();
-            };
-            note.bufferSource.stop(stopTime);
+            }, stopTime);
         });
     }
-    scheduleNoteOff(channelNumber, note, _velocity, endTime, force) {
+    scheduleNoteOff(channelNumber, noteNumber, _velocity, endTime, force) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
-        if (!force && 0.5 <= channel.state.sustainPedal)
+        if (!force) {
+            if (channel.isDrum)
+                return;
+            if (0.5 <= channel.state.sustainPedal)
+                return;
+        }
+        const note = this.findNoteOffTarget(channel, noteNumber);
+        if (!note)
             return;
-        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(channel, note, endTime, stopTime);
+        note.ending = true;
+        this.releaseNote(channel, note, endTime);
     }
     findNoteOffTarget(channel, noteNumber) {
         const scheduledNotes = channel.scheduledNotes;
@@ -984,16 +979,14 @@ class MidyGMLite {
     }
     noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const note = this.findNoteOffTarget(channel, noteNumber);
-        return this.scheduleNoteOff(channelNumber, note, velocity, scheduleTime, false);
+        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], velocity, scheduleTime);
+            const promise = this.scheduleNoteOff(channelNumber, channel.sustainNotes[i].noteNumber, velocity, scheduleTime);
             promises.push(promise);
         }
         channel.sustainNotes = [];
@@ -1107,11 +1100,12 @@ class MidyGMLite {
         return state;
     }
     applyVoiceParams(channel, controllerType, scheduleTime) {
-        this.processScheduledNotes(channel, (note) => {
+        this.processScheduledNotes(channel, scheduleTime, (note) => {
             const controllerState = this.getControllerState(channel, note.noteNumber, note.velocity);
             const voiceParams = note.voice.getParams(controllerType, controllerState);
-            let appliedFilterEnvelope = false;
-            let appliedVolumeEnvelope = false;
+            let applyVolumeEnvelope = false;
+            let applyFilterEnvelope = false;
+            let applyPitchEnvelope = false;
             for (const [key, value] of Object.entries(voiceParams)) {
                 const prevValue = note.voiceParams[key];
                 if (value === prevValue)
@@ -1120,32 +1114,21 @@ class MidyGMLite {
                 if (key in this.voiceParamsHandlers) {
                     this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
                 }
-                else if (filterEnvelopeKeySet.has(key)) {
-                    if (appliedFilterEnvelope)
-                        continue;
-                    appliedFilterEnvelope = true;
-                    const noteVoiceParams = note.voiceParams;
-                    for (let i = 0; i < filterEnvelopeKeys.length; i++) {
-                        const key = filterEnvelopeKeys[i];
-                        if (key in voiceParams)
-                            noteVoiceParams[key] = voiceParams[key];
-                    }
-                    this.setFilterEnvelope(note, scheduleTime);
-                    this.setPitchEnvelope(note, scheduleTime);
-                }
-                else if (volumeEnvelopeKeySet.has(key)) {
-                    if (appliedVolumeEnvelope)
-                        continue;
-                    appliedVolumeEnvelope = true;
-                    const noteVoiceParams = note.voiceParams;
-                    for (let i = 0; i < volumeEnvelopeKeys.length; i++) {
-                        const key = volumeEnvelopeKeys[i];
-                        if (key in voiceParams)
-                            noteVoiceParams[key] = voiceParams[key];
-                    }
-                    this.setVolumeEnvelope(note, scheduleTime);
+                else {
+                    if (volumeEnvelopeKeySet.has(key))
+                        applyVolumeEnvelope = true;
+                    if (filterEnvelopeKeySet.has(key))
+                        applyFilterEnvelope = true;
+                    if (pitchEnvelopeKeySet.has(key))
+                        applyPitchEnvelope = true;
                 }
             }
+            if (applyVolumeEnvelope)
+                this.setVolumeEnvelope(note, scheduleTime);
+            if (applyFilterEnvelope)
+                this.setFilterEnvelope(note, scheduleTime);
+            if (applyPitchEnvelope)
+                this.setPitchEnvelope(note, scheduleTime);
         });
     }
     createControlChangeHandlers() {
@@ -1177,7 +1160,7 @@ class MidyGMLite {
     }
     updateModulation(channel, scheduleTime) {
         const depth = channel.state.modulationDepth * channel.modulationDepthRange;
-        this.processScheduledNotes(channel, (note) => {
+        this.processScheduledNotes(channel, scheduleTime, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
             }
@@ -1238,7 +1221,7 @@ class MidyGMLite {
         scheduleTime ??= this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
-            this.processScheduledNotes(channel, (note) => {
+            this.processScheduledNotes(channel, scheduleTime, (note) => {
                 channel.sustainNotes.push(note);
             });
         }