@marmooo/midy 0.1.3 → 0.1.4

package/esm/midy-GM1.d.ts

@@ -79,12 +79,13 @@ export class MidyGM1 {
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
     setVolumeEnvelope(note: any): void;
     setPitch(note: any, semitoneOffset: any): void;
-    setFilterNode(channel: any, note: any): void;
+    clampCutoffFrequency(frequency: any): number;
+    setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
-    scheduleNoteRelease(channelNumber: any, noteNumber: any, velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
+    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;

package/esm/midy-GM1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAwBA;IAmBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA9CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAyBhB,kBAAgC;IAChC,gBAA4C;IAC5C,gBAAiD;IAKnD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,mFAmBC;IAED,yDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,mCAcC;IAED,+CAwBC;IAED,6CA6BC;IAED,+DA0BC;IAED,wHA8BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,2FA+BC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA5iCD;IAUE,gFAKC;IAdD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAwBA;IAmBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA9CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAyBhB,kBAAgC;IAChC,gBAA4C;IAC5C,gBAAiD;IAKnD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,mFAmBC;IAED,yDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,mCAeC;IAED,+CAwBC;IAED,6CAIC;IAED,mCAsBC;IAED,+DA0BC;IAED,wHAmCC;IAED,kGA6BC;IAED,0EAGC;IAED,uIAyCC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,2FA+BC;IAED,qCAkBC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAaC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AApjCD;IAUE,gFAKC;IAdD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/esm/midy-GM1.js

@@ -432,12 +432,13 @@ export class MidyGM1 {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.scheduledNotes.forEach((noteList) => {
-            noteList.forEach((note) => {
-                if (note) {
-                    const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
-                    this.notePromises.push(promise);
-                }
-            });
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
+                this.notePromises.push(promise);
+            }
         });
         channel.scheduledNotes.clear();
         await Promise.all(this.notePromises);
@@ -529,7 +530,6 @@ export class MidyGM1 {
     }
     setVolumeEnvelope(note) {
         const { instrumentKey, startTime } = note;
-        note.volumeNode = new GainNode(this.audioContext, { gain: 0 });
         const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
         const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
         const volDelay = startTime + instrumentKey.volDelay;
@@ -537,6 +537,8 @@ export class MidyGM1 {
         const volHold = volAttack + instrumentKey.volHold;
         const volDecay = volHold + instrumentKey.volDecay;
         note.volumeNode.gain
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(0, startTime)
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
@@ -560,29 +562,27 @@ export class MidyGM1 {
             .setValueAtTime(peekPitch, modHold)
             .linearRampToValueAtTime(basePitch, modDecay);
     }
-    setFilterNode(channel, note) {
-        const { instrumentKey, noteNumber, startTime } = note;
-        const softPedalFactor = 1 -
-            (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
-        const maxFreq = this.audioContext.sampleRate / 2;
-        const baseFreq = this.centToHz(instrumentKey.initialFilterFc) *
-            softPedalFactor;
-        const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
-        const sustainFreq = (baseFreq +
-            (peekFreq - baseFreq) * (1 - instrumentKey.modSustain)) * softPedalFactor;
-        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
-        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
+    clampCutoffFrequency(frequency) {
+        const minFrequency = 20; // min Hz of initialFilterFc
+        const maxFrequency = 20000; // max Hz of initialFilterFc
+        return Math.max(minFrequency, Math.min(frequency, maxFrequency));
+    }
+    setFilterEnvelope(note) {
+        const { instrumentKey, startTime } = note;
+        const baseFreq = this.centToHz(instrumentKey.initialFilterFc);
+        const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc);
+        const sustainFreq = baseFreq +
+            (peekFreq - baseFreq) * (1 - instrumentKey.modSustain);
+        const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
+        const adjustedPeekFreq = this.clampCutoffFrequency(peekFreq);
+        const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq);
         const modDelay = startTime + instrumentKey.modDelay;
         const modAttack = modDelay + instrumentKey.modAttack;
         const modHold = modAttack + instrumentKey.modHold;
         const modDecay = modHold + instrumentKey.modDecay;
-        note.filterNode = new BiquadFilterNode(this.audioContext, {
-            type: "lowpass",
-            Q: instrumentKey.initialFilterQ / 10, // dB
-            frequency: adjustedBaseFreq,
-        });
         note.filterNode.frequency
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(adjustedBaseFreq, startTime)
             .setValueAtTime(adjustedBaseFreq, modDelay)
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
@@ -619,8 +619,13 @@ export class MidyGM1 {
         const semitoneOffset = this.calcSemitoneOffset(channel);
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
-        this.setFilterNode(channel, note);
+        note.volumeNode = new GainNode(this.audioContext);
+        note.filterNode = new BiquadFilterNode(this.audioContext, {
+            type: "lowpass",
+            Q: instrumentKey.initialFilterQ / 10 * channel.filterResonance, // dB
+        });
         this.setVolumeEnvelope(note);
+        this.setFilterEnvelope(note);
         if (0 < channel.modulationDepth) {
             this.setPitch(note, semitoneOffset);
             this.startModulation(channel, note, startTime);
@@ -659,7 +664,7 @@ export class MidyGM1 {
         const now = this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, now);
     }
-    scheduleNoteRelease(channelNumber, noteNumber, velocity, stopTime, stopPedal = false) {
+    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, stopPedal = false) {
         const channel = this.channels[channelNumber];
         if (stopPedal && channel.sustainPedal)
             return;
@@ -672,14 +677,11 @@ export class MidyGM1 {
                 continue;
             if (note.ending)
                 continue;
-            const velocityRate = (velocity + 127) / 127;
-            const volEndTime = stopTime +
-                note.instrumentKey.volRelease * velocityRate;
+            const volEndTime = stopTime + note.instrumentKey.volRelease;
             note.volumeNode.gain
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, volEndTime);
-            const modRelease = stopTime +
-                note.instrumentKey.modRelease * velocityRate;
+            const modRelease = stopTime + note.instrumentKey.modRelease;
             note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, modRelease);
@@ -715,13 +717,14 @@ export class MidyGM1 {
         const promises = [];
         channel.sustainPedal = false;
         channel.scheduledNotes.forEach((noteList) => {
-            noteList.forEach((note) => {
-                if (note) {
-                    const { noteNumber } = note;
-                    const promise = this.releaseNote(channelNumber, noteNumber, velocity);
-                    promises.push(promise);
-                }
-            });
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const { noteNumber } = note;
+                const promise = this.releaseNote(channelNumber, noteNumber, velocity);
+                promises.push(promise);
+            }
         });
         return promises;
     }
@@ -791,15 +794,19 @@ export class MidyGM1 {
     }
     updateModulation(channel) {
         const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            if (activeNote.modulationDepth) {
-                activeNote.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
-            }
-            else {
-                const semitoneOffset = this.calcSemitoneOffset(channel);
-                this.setPitch(activeNote, semitoneOffset);
-                this.startModulation(channel, activeNote, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                if (note.modulationDepth) {
+                    note.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
+                }
+                else {
+                    const semitoneOffset = this.calcSemitoneOffset(channel);
+                    this.setPitch(note, semitoneOffset);
+                    this.startModulation(channel, note, now);
+                }
             }
         });
     }
@@ -907,13 +914,17 @@ export class MidyGM1 {
     }
     updateDetune(channel, detuneChange) {
         const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            const { bufferSource } = activeNote;
-            const detune = bufferSource.detune.value + detuneChange;
-            bufferSource.detune
-                .cancelScheduledValues(now)
-                .setValueAtTime(detune, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const { bufferSource } = note;
+                const detune = bufferSource.detune.value + detuneChange;
+                bufferSource.detune
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(detune, now);
+            }
         });
     }
     handlePitchBendRangeRPN(channelNumber) {

package/esm/midy-GM2.d.ts

@@ -167,14 +167,15 @@ export class MidyGM2 {
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
     setVolumeEnvelope(note: any): void;
     setPitch(note: any, semitoneOffset: any): void;
-    setFilterNode(channel: any, note: any): void;
+    clampCutoffFrequency(frequency: any): number;
+    setFilterEnvelope(channel: any, note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     startVibrato(channel: any, note: any, startTime: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     calcBank(channel: any, channelNumber: any): any;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
-    scheduleNoteRelease(channelNumber: any, noteNumber: any, velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
+    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any): any[];

package/esm/midy-GM2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAwBA;IAkCE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAgCF;;;;;OAWC;IAtHD,qBAAmB;IACnB,kBAAc;IACd,yBAAqB;IACrB,2BAAuB;IACvB;;;MAGE;IACF;;;;;;MAME;IACF,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA8ClB;;;;;MA4BE;IAGA,kBAAgC;IAChC;;;;;MAAqD;IACrD,gBAA4C;IAC5C,gBAAiD;IACjD;;;MAA8D;IAC9D;;;;;;;;MAAyD;IAO3D,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAcC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAkDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,mFAmBC;IAED,yDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,kFAuBC;IAED;;;;MAWC;IAED,gFAUC;IAED,mFAYC;IAED,sGAcC;IAID;;;MA+BC;IAED;;;;;;;;MA0CC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,mCAeC;IAED,+CAwBC;IAED,6CAIC;IAED,iDAyBC;IAED,+DA0BC;IAED,4DAiBC;IAED,wHA0CC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,uIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,gFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,2FAuDC;IAED,+CAEC;IAED,qCAkBC;IAED,8DAIC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAGD,oDAEC;IAED,mEAWC;IAED,mEAWC;IAED,wDAWC;IAED,uDAGC;IAED,kFAeC;IAED,2DAMC;IAED,oCAqBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAaC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,wDAKC;IAED,6EAKC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAiDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,mDAeC;IAED,4CAOC;IAED,+BAKC;IAED,qDAiBC;IAED,gCAMC;IAED,kCAEC;IA6BD,4CAEC;IAED,4CAaC;IAED,+BAiBC;IAED,wFAKC;IAED,mCAQC;IAED,qCAEC;IAED,oCAUC;IAED,sCAEC;IAED,oCAaC;IAED,sCAEC;IAED,wCAWC;IAED,0CAEC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAhyDD;IAUE,gFAKC;IAdD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/esm/midy-GM2.js

@@ -545,12 +545,13 @@ export class MidyGM2 {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.scheduledNotes.forEach((noteList) => {
-            noteList.forEach((note) => {
-                if (note) {
-                    const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
-                    this.notePromises.push(promise);
-                }
-            });
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
+                this.notePromises.push(promise);
+            }
         });
         channel.scheduledNotes.clear();
         await Promise.all(this.notePromises);
@@ -773,7 +774,6 @@ export class MidyGM2 {
     }
     setVolumeEnvelope(note) {
         const { instrumentKey, startTime } = note;
-        note.volumeNode = new GainNode(this.audioContext, { gain: 0 });
         const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
         const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
         const volDelay = startTime + instrumentKey.volDelay;
@@ -781,6 +781,8 @@ export class MidyGM2 {
         const volHold = volAttack + instrumentKey.volHold;
         const volDecay = volHold + instrumentKey.volDecay;
         note.volumeNode.gain
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(0, startTime)
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
@@ -804,29 +806,30 @@ export class MidyGM2 {
             .setValueAtTime(peekPitch, modHold)
             .linearRampToValueAtTime(basePitch, modDecay);
     }
-    setFilterNode(channel, note) {
+    clampCutoffFrequency(frequency) {
+        const minFrequency = 20; // min Hz of initialFilterFc
+        const maxFrequency = 20000; // max Hz of initialFilterFc
+        return Math.max(minFrequency, Math.min(frequency, maxFrequency));
+    }
+    setFilterEnvelope(channel, note) {
         const { instrumentKey, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
-        const maxFreq = this.audioContext.sampleRate / 2;
         const baseFreq = this.centToHz(instrumentKey.initialFilterFc) *
             softPedalFactor;
         const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
         const sustainFreq = baseFreq +
             (peekFreq - baseFreq) * (1 - instrumentKey.modSustain);
-        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
-        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
+        const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
+        const adjustedPeekFreq = this.clampCutoffFrequency(peekFreq);
+        const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq);
         const modDelay = startTime + instrumentKey.modDelay;
         const modAttack = modDelay + instrumentKey.modAttack;
         const modHold = modAttack + instrumentKey.modHold;
         const modDecay = modHold + instrumentKey.modDecay;
-        note.filterNode = new BiquadFilterNode(this.audioContext, {
-            type: "lowpass",
-            Q: instrumentKey.initialFilterQ / 10, // dB
-            frequency: adjustedBaseFreq,
-        });
         note.filterNode.frequency
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(adjustedBaseFreq, startTime)
             .setValueAtTime(adjustedBaseFreq, modDelay)
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
@@ -879,8 +882,13 @@ export class MidyGM2 {
         const semitoneOffset = this.calcSemitoneOffset(channel);
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
-        this.setFilterNode(channel, note);
+        note.volumeNode = new GainNode(this.audioContext);
+        note.filterNode = new BiquadFilterNode(this.audioContext, {
+            type: "lowpass",
+            Q: instrumentKey.initialFilterQ / 10 * channel.filterResonance, // dB
+        });
         this.setVolumeEnvelope(note);
+        this.setFilterEnvelope(channel, note);
         if (0 < channel.vibratoDepth) {
             this.startVibrato(channel, note, startTime);
         }
@@ -938,7 +946,7 @@ export class MidyGM2 {
         const now = this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, now);
     }
-    scheduleNoteRelease(channelNumber, noteNumber, velocity, stopTime, stopPedal = false) {
+    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, stopPedal = false) {
         const channel = this.channels[channelNumber];
         if (stopPedal && channel.sustainPedal)
             return;
@@ -953,14 +961,11 @@ export class MidyGM2 {
                 continue;
             if (note.ending)
                 continue;
-            const velocityRate = (velocity + 127) / 127;
-            const volEndTime = stopTime +
-                note.instrumentKey.volRelease * velocityRate;
+            const volEndTime = stopTime + note.instrumentKey.volRelease;
             note.volumeNode.gain
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, volEndTime);
-            const modRelease = stopTime +
-                note.instrumentKey.modRelease * velocityRate;
+            const modRelease = stopTime + note.instrumentKey.modRelease;
             note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, modRelease);
@@ -1000,13 +1005,14 @@ export class MidyGM2 {
         const promises = [];
         channel.sustainPedal = false;
         channel.scheduledNotes.forEach((noteList) => {
-            noteList.forEach((note) => {
-                if (note) {
-                    const { noteNumber } = note;
-                    const promise = this.releaseNote(channelNumber, noteNumber, velocity);
-                    promises.push(promise);
-                }
-            });
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const { noteNumber } = note;
+                const promise = this.releaseNote(channelNumber, noteNumber, velocity);
+                promises.push(promise);
+            }
         });
         return promises;
     }
@@ -1134,15 +1140,19 @@ export class MidyGM2 {
     }
     updateModulation(channel) {
         const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            if (activeNote.modulationDepth) {
-                activeNote.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
-            }
-            else {
-                const semitoneOffset = this.calcSemitoneOffset(channel);
-                this.setPitch(activeNote, semitoneOffset);
-                this.startModulation(channel, activeNote, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                if (note.modulationDepth) {
+                    note.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
+                }
+                else {
+                    const semitoneOffset = this.calcSemitoneOffset(channel);
+                    this.setPitch(note, semitoneOffset);
+                    this.startModulation(channel, note, now);
+                }
             }
         });
     }
@@ -1306,13 +1316,17 @@ export class MidyGM2 {
     }
     updateDetune(channel, detuneChange) {
         const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            const { bufferSource } = activeNote;
-            const detune = bufferSource.detune.value + detuneChange;
-            bufferSource.detune
-                .cancelScheduledValues(now)
-                .setValueAtTime(detune, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const { bufferSource } = note;
+                const detune = bufferSource.detune.value + detuneChange;
+                bufferSource.detune
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(detune, now);
+            }
         });
     }
     handlePitchBendRangeRPN(channelNumber) {

package/esm/midy-GMLite.d.ts

@@ -77,12 +77,13 @@ export class MidyGMLite {
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
     setVolumeEnvelope(note: any): void;
     setPitch(note: any, semitoneOffset: any): void;
-    setFilterNode(channel: any, note: any): void;
+    clampCutoffFrequency(frequency: any): number;
+    setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
-    scheduleNoteRelease(channelNumber: any, noteNumber: any, velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
+    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAsBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAuBhB,kBAAgC;IAChC,gBAA4C;IAC5C,gBAAiD;IAKnD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,mFAmBC;IAED,yDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,4BAEC;IAED,yCAEC;IAED,mFAGC;IAED,mCAcC;IAED,+CAwBC;IAED,6CA6BC;IAED,+DA0BC;IAED,wHA8BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,2FA+BC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA1+BD;IAQE,gFAKC;IAZD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAsBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAuBhB,kBAAgC;IAChC,gBAA4C;IAC5C,gBAAiD;IAKnD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,mFAmBC;IAED,yDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,4BAEC;IAED,yCAEC;IAED,mFAGC;IAED,mCAeC;IAED,+CAwBC;IAED,6CAIC;IAED,mCAsBC;IAED,+DA0BC;IAED,wHAmCC;IAED,kGA6BC;IAED,0EAGC;IAED,uIAyCC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,2FA+BC;IAED,qCAkBC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAaC;IAED,kDAKC;IAED,iEAOC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAl/BD;IAQE,gFAKC;IAZD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}