@marmooo/midy 0.4.2 → 0.4.3

package/README.md

@@ -23,6 +23,7 @@ This library provides several files depending on the implementation level.
 - [@marmooo/midi-player](https://marmooo.github.io/midi-player/) - GUI library
 - [Humidy](https://marmooo.github.io/humidy/) - GM2 MIDI mixer app
 - [Timidy](https://marmooo.github.io/timidy/) - Timidity++ style MIDI player
+- [4x4pad](https://marmooo.github.io/4x4pad/) - 4x4 grid style MIDI controller
 
 ## Support Status
 

package/esm/midy-GM1.d.ts

@@ -31,6 +31,8 @@ export class MidyGM1 extends EventTarget {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    totalTimeEventTypes: Set<string>;
+    tempo: number;
     loop: boolean;
     playPromise: any;
     timeline: any[];
@@ -94,7 +96,6 @@ export class MidyGM1 extends EventTarget {
     currentTime(): number;
     processScheduledNotes(channel: any, callback: any): Promise<void>;
     processActiveNotes(channel: any, scheduleTime: any, callback: any): Promise<void>;
-    cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
     centToRate(cent: any): number;
     centToHz(cent: any): number;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AA+FA;IA2BE;;;;;;;;;;;MAWE;IAEF,+BAgBC;IAvDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,0BAAuD;IACvD,4BAAyB;IACzB,0BAAuB;IACvB,kCAA+B;IAC/B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,cAAa;IACb,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAiBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF,uBAAmD;IACnD;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAWC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDASC;IAED,4DASC;IAED,gEAoDC;IAED,mCAOC;IAED,uBASC;IAED,yDAgCC;IAED,2BAyEC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAIC;IAED,uBAMC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAIC;IAED,kEAWC;IAED,kFAYC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,4GAkCC;IAED,uEAwCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAoBC;IAED,gCASC;IAED,iEAqBC;IAED,4FAmBC;IAED,6CAUC;IAED,qDAUC;IAED,qFAeC;IAED,+BAmBC;IAED,kDAOC;IAED,sFA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAYC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCASC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAuGA;IA+BE;;;;;;;;;;;MAWE;IAEF,+BAgBC;IA3DD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,0BAAuD;IACvD,4BAAyB;IACzB,0BAAuB;IACvB,kCAA+B;IAC/B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iCAEG;IACH,cAAU;IACV,cAAa;IACb,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAiBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF,uBAAmD;IACnD;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAeC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDASC;IAED,4DASC;IAED,gEAsDC;IAED,mCASC;IAED,uBAUC;IAED,yDAqCC;IAED,2BA0EC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAQC;IAED,uBAMC;IAED,sBAIC;IAED,uBAMC;IAED,wBAIC;IAED,0BAKC;IAED,wBAYC;IAED,sBAIC;IAED,kEAWC;IAED,kFAYC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEAyCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAqBC;IAED,4FAmBC;IAED,6CAUC;IAED,qDAUC;IAED,qFAeC;IAED,+BAmBC;IAED,kDAOC;IAED,sFA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAYC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAUC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}

package/esm/midy-GM1.js

@@ -14,6 +14,12 @@ class Note {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "adjustedBaseFreq", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 20000
+        });
         Object.defineProperty(this, "index", {
             enumerable: true,
             configurable: true,
@@ -147,6 +153,11 @@ const pitchEnvelopeKeys = [
     "playbackRate",
 ];
 const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
+function cbToRatio(cb) {
+    return Math.pow(10, cb / 200);
+}
+const decayCurve = 1 / (-Math.log(cbToRatio(-1000)));
+const releaseCurve = 1 / (-Math.log(cbToRatio(-600)));
 export class MidyGM1 extends EventTarget {
     constructor(audioContext) {
         super();
@@ -264,6 +275,20 @@ export class MidyGM1 extends EventTarget {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "totalTimeEventTypes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set([
+                "noteOff",
+            ])
+        });
+        Object.defineProperty(this, "tempo", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 1
+        });
         Object.defineProperty(this, "loop", {
             enumerable: true,
             configurable: true,
@@ -372,13 +397,13 @@ export class MidyGM1 extends EventTarget {
         this.totalTime = this.calcTotalTime();
     }
     cacheVoiceIds() {
-        const timeline = this.timeline;
+        const { channels, timeline, voiceCounter } = this;
         for (let i = 0; i < timeline.length; i++) {
             const event = timeline[i];
             switch (event.type) {
                 case "noteOn": {
-                    const audioBufferId = this.getVoiceId(this.channels[event.channel], event.noteNumber, event.velocity);
-                    this.voiceCounter.set(audioBufferId, (this.voiceCounter.get(audioBufferId) ?? 0) + 1);
+                    const audioBufferId = this.getVoiceId(channels[event.channel], event.noteNumber, event.velocity);
+                    voiceCounter.set(audioBufferId, (voiceCounter.get(audioBufferId) ?? 0) + 1);
                     break;
                 }
                 case "controller":
@@ -393,9 +418,9 @@ export class MidyGM1 extends EventTarget {
                     this.setProgramChange(event.channel, event.programNumber, event.startTime);
             }
         }
-        for (const [audioBufferId, count] of this.voiceCounter) {
+        for (const [audioBufferId, count] of voiceCounter) {
             if (count === 1)
-                this.voiceCounter.delete(audioBufferId);
+                voiceCounter.delete(audioBufferId);
         }
         this.GM1SystemOn();
     }
@@ -404,7 +429,12 @@ export class MidyGM1 extends EventTarget {
         const bankTable = this.soundFontTable[programNumber];
         if (!bankTable)
             return;
-        const bank = channel.isDrum ? 128 : 0;
+        let bank = channel.isDrum ? 128 : 0;
+        if (bankTable[bank] === undefined) {
+            if (channel.isDrum)
+                return;
+            bank = 0;
+        }
         const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
@@ -462,11 +492,13 @@ export class MidyGM1 extends EventTarget {
         const lookAheadCheckTime = scheduleTime + timeOffset + this.lookAhead;
         const schedulingOffset = this.startDelay - timeOffset;
         const timeline = this.timeline;
+        const inverseTempo = 1 / this.tempo;
         while (queueIndex < timeline.length) {
             const event = timeline[queueIndex];
-            if (lookAheadCheckTime < event.startTime)
+            const t = event.startTime * inverseTempo;
+            if (lookAheadCheckTime < t)
                 break;
-            const startTime = event.startTime + schedulingOffset;
+            const startTime = t + schedulingOffset;
             switch (event.type) {
                 case "noteOn":
                     this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
@@ -492,8 +524,10 @@ export class MidyGM1 extends EventTarget {
         return queueIndex;
     }
     getQueueIndex(second) {
-        for (let i = 0; i < this.timeline.length; i++) {
-            if (second <= this.timeline[i].startTime) {
+        const timeline = this.timeline;
+        const inverseTempo = 1 / this.tempo;
+        for (let i = 0; i < timeline.length; i++) {
+            if (second <= timeline[i].startTime * inverseTempo) {
                 return i;
             }
         }
@@ -504,40 +538,44 @@ export class MidyGM1 extends EventTarget {
         this.drumExclusiveClassNotes.fill(undefined);
         this.voiceCache.clear();
         this.realtimeVoiceCache.clear();
-        for (let i = 0; i < this.channels.length; i++) {
-            this.channels[i].scheduledNotes = [];
+        const channels = this.channels;
+        for (let i = 0; i < channels.length; i++) {
+            channels[i].scheduledNotes = [];
             this.resetChannelStates(i);
         }
     }
     updateStates(queueIndex, nextQueueIndex) {
+        const { timeline, resumeTime } = this;
+        const inverseTempo = 1 / this.tempo;
         const now = this.audioContext.currentTime;
         if (nextQueueIndex < queueIndex)
             queueIndex = 0;
         for (let i = queueIndex; i < nextQueueIndex; i++) {
-            const event = this.timeline[i];
+            const event = timeline[i];
             switch (event.type) {
                 case "controller":
-                    this.setControlChange(event.channel, event.controllerType, event.value, now - this.resumeTime + event.startTime);
+                    this.setControlChange(event.channel, event.controllerType, event.value, now - resumeTime + event.startTime * inverseTempo);
                     break;
                 case "programChange":
-                    this.setProgramChange(event.channel, event.programNumber, now - this.resumeTime + event.startTime);
+                    this.setProgramChange(event.channel, event.programNumber, now - resumeTime + event.startTime * inverseTempo);
                     break;
                 case "pitchBend":
-                    this.setPitchBend(event.channel, event.value + 8192, now - this.resumeTime + event.startTime);
+                    this.setPitchBend(event.channel, event.value + 8192, now - resumeTime + event.startTime * inverseTempo);
                     break;
                 case "sysEx":
-                    this.handleSysEx(event.data, now - this.resumeTime + event.startTime);
+                    this.handleSysEx(event.data, now - resumeTime + event.startTime * inverseTempo);
             }
         }
     }
     async playNotes() {
-        if (this.audioContext.state === "suspended") {
-            await this.audioContext.resume();
+        const audioContext = this.audioContext;
+        if (audioContext.state === "suspended") {
+            await audioContext.resume();
         }
         const paused = this.isPaused;
         this.isPlaying = true;
         this.isPaused = false;
-        this.startTime = this.audioContext.currentTime;
+        this.startTime = audioContext.currentTime;
         if (paused) {
             this.dispatchEvent(new Event("resumed"));
         }
@@ -548,42 +586,41 @@ export class MidyGM1 extends EventTarget {
         let exitReason;
         this.notePromises = [];
         while (true) {
-            const now = this.audioContext.currentTime;
-            if (this.timeline.length <= queueIndex) {
+            const now = audioContext.currentTime;
+            if (this.totalTime < this.currentTime() ||
+                this.timeline.length <= queueIndex) {
                 await this.stopNotes(0, true, now);
                 if (this.loop) {
-                    this.notePromises = [];
                     this.resetAllStates();
-                    this.startTime = this.audioContext.currentTime;
+                    this.startTime = audioContext.currentTime;
                     this.resumeTime = 0;
                     queueIndex = 0;
                     this.dispatchEvent(new Event("looped"));
                     continue;
                 }
                 else {
-                    await this.audioContext.suspend();
+                    await audioContext.suspend();
                     exitReason = "ended";
                     break;
                 }
             }
             if (this.isPausing) {
                 await this.stopNotes(0, true, now);
-                await this.audioContext.suspend();
-                this.notePromises = [];
+                await audioContext.suspend();
                 this.isPausing = false;
                 exitReason = "paused";
                 break;
             }
             else if (this.isStopping) {
                 await this.stopNotes(0, true, now);
-                await this.audioContext.suspend();
+                await audioContext.suspend();
                 this.isStopping = false;
                 exitReason = "stopped";
                 break;
             }
             else if (this.isSeeking) {
                 this.stopNotes(0, true, now);
-                this.startTime = this.audioContext.currentTime;
+                this.startTime = audioContext.currentTime;
                 const nextQueueIndex = this.getQueueIndex(this.resumeTime);
                 this.updateStates(queueIndex, nextQueueIndex);
                 queueIndex = nextQueueIndex;
@@ -596,7 +633,6 @@ export class MidyGM1 extends EventTarget {
             await this.scheduleTask(() => { }, waitTime);
         }
         if (exitReason !== "paused") {
-            this.notePromises = [];
             this.resetAllStates();
         }
         this.isPlaying = false;
@@ -694,11 +730,13 @@ export class MidyGM1 extends EventTarget {
         return Promise.all(promises);
     }
     stopNotes(velocity, force, scheduleTime) {
-        const promises = [];
-        for (let i = 0; i < this.channels.length; i++) {
-            promises.push(this.stopChannelNotes(i, velocity, force, scheduleTime));
+        const channels = this.channels;
+        for (let i = 0; i < channels.length; i++) {
+            this.stopChannelNotes(i, velocity, force, scheduleTime);
         }
-        return Promise.all(this.notePromises);
+        const stopPromise = Promise.all(this.notePromises);
+        this.notePromises = [];
+        return stopPromise;
     }
     async start() {
         if (this.isPlaying || this.isPaused)
@@ -736,11 +774,17 @@ export class MidyGM1 extends EventTarget {
         }
     }
     calcTotalTime() {
+        const totalTimeEventTypes = this.totalTimeEventTypes;
+        const timeline = this.timeline;
+        const inverseTempo = 1 / this.tempo;
         let totalTime = 0;
-        for (let i = 0; i < this.timeline.length; i++) {
-            const event = this.timeline[i];
-            if (totalTime < event.startTime)
-                totalTime = event.startTime;
+        for (let i = 0; i < timeline.length; i++) {
+            const event = timeline[i];
+            if (!totalTimeEventTypes.has(event.type))
+                continue;
+            const t = event.startTime * inverseTempo;
+            if (totalTime < t)
+                totalTime = t;
         }
         return totalTime + this.startDelay;
     }
@@ -780,9 +824,6 @@ export class MidyGM1 extends EventTarget {
         }
         await Promise.all(tasks);
     }
-    cbToRatio(cb) {
-        return Math.pow(10, cb / 200);
-    }
     rateToCent(rate) {
         return 1200 * Math.log2(rate);
     }
@@ -811,26 +852,26 @@ export class MidyGM1 extends EventTarget {
     }
     setVolumeEnvelope(note, scheduleTime) {
         const { voiceParams, startTime } = note;
-        const attackVolume = this.cbToRatio(-voiceParams.initialAttenuation);
+        const attackVolume = cbToRatio(-voiceParams.initialAttenuation);
         const sustainVolume = attackVolume * (1 - voiceParams.volSustain);
         const volDelay = startTime + voiceParams.volDelay;
         const volAttack = volDelay + voiceParams.volAttack;
         const volHold = volAttack + voiceParams.volHold;
-        const volDecay = volHold + voiceParams.volDecay;
+        const decayDuration = voiceParams.volDecay;
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(0, startTime)
-            .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
-            .exponentialRampToValueAtTime(attackVolume, volAttack)
+            .setValueAtTime(0, volDelay)
+            .linearRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
-            .linearRampToValueAtTime(sustainVolume, volDecay);
+            .setTargetAtTime(sustainVolume, volHold, decayDuration * decayCurve);
     }
     setPitchEnvelope(note, scheduleTime) {
         const { voiceParams } = note;
         const baseRate = voiceParams.playbackRate;
         note.bufferSource.playbackRate
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(baseRate, scheduleTime);
+            .setValueAtTime(baseRate, note.startTime);
         const modEnvToPitch = voiceParams.modEnvToPitch;
         if (modEnvToPitch === 0)
             return;
@@ -840,12 +881,12 @@ export class MidyGM1 extends EventTarget {
         const modDelay = note.startTime + voiceParams.modDelay;
         const modAttack = modDelay + voiceParams.modAttack;
         const modHold = modAttack + voiceParams.modHold;
-        const modDecay = modHold + voiceParams.modDecay;
+        const decayDuration = voiceParams.modDecay;
         note.bufferSource.playbackRate
             .setValueAtTime(baseRate, modDelay)
-            .exponentialRampToValueAtTime(peekRate, modAttack)
+            .linearRampToValueAtTime(peekRate, modAttack)
             .setValueAtTime(peekRate, modHold)
-            .linearRampToValueAtTime(baseRate, modDecay);
+            .setTargetAtTime(baseRate, modHold, decayDuration * decayCurve);
     }
     clampCutoffFrequency(frequency) {
         const minFrequency = 20; // min Hz of initialFilterFc
@@ -854,36 +895,42 @@ export class MidyGM1 extends EventTarget {
     }
     setFilterEnvelope(note, scheduleTime) {
         const { voiceParams, startTime } = note;
-        const baseFreq = this.centToHz(voiceParams.initialFilterFc);
-        const peekFreq = this.centToHz(voiceParams.initialFilterFc + voiceParams.modEnvToFilterFc);
-        const sustainFreq = baseFreq +
-            (peekFreq - baseFreq) * (1 - voiceParams.modSustain);
+        const modEnvToFilterFc = voiceParams.modEnvToFilterFc;
+        const baseCent = voiceParams.initialFilterFc;
+        const peekCent = baseCent + modEnvToFilterFc;
+        const sustainCent = baseCent +
+            modEnvToFilterFc * (1 - voiceParams.modSustain);
+        const baseFreq = this.centToHz(baseCent);
+        const peekFreq = this.centToHz(peekCent);
+        const sustainFreq = this.centToHz(sustainCent);
         const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
         const adjustedPeekFreq = this.clampCutoffFrequency(peekFreq);
         const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq);
         const modDelay = startTime + voiceParams.modDelay;
         const modAttack = modDelay + voiceParams.modAttack;
         const modHold = modAttack + voiceParams.modHold;
-        const modDecay = modHold + voiceParams.modDecay;
+        const decayDuration = voiceParams.modDecay;
+        note.adjustedBaseFreq = adjustedBaseFreq;
         note.filterNode.frequency
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(adjustedBaseFreq, startTime)
             .setValueAtTime(adjustedBaseFreq, modDelay)
-            .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
+            .linearRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
-            .linearRampToValueAtTime(adjustedSustainFreq, modDecay);
+            .setTargetAtTime(adjustedSustainFreq, modHold, decayDuration * decayCurve);
     }
     startModulation(channel, note, scheduleTime) {
+        const audioContext = this.audioContext;
         const { voiceParams } = note;
-        note.modulationLFO = new OscillatorNode(this.audioContext, {
+        note.modulationLFO = new OscillatorNode(audioContext, {
             frequency: this.centToHz(voiceParams.freqModLFO),
         });
-        note.filterDepth = new GainNode(this.audioContext, {
+        note.filterDepth = new GainNode(audioContext, {
             gain: voiceParams.modLfoToFilterFc,
         });
-        note.modulationDepth = new GainNode(this.audioContext);
+        note.modulationDepth = new GainNode(audioContext);
         this.setModLfoToPitch(channel, note, scheduleTime);
-        note.volumeDepth = new GainNode(this.audioContext);
+        note.volumeDepth = new GainNode(audioContext);
         this.setModLfoToVolume(note, scheduleTime);
         note.modulationLFO.start(note.startTime + voiceParams.delayModLFO);
         note.modulationLFO.connect(note.filterDepth);
@@ -922,7 +969,8 @@ export class MidyGM1 extends EventTarget {
         }
     }
     async setNoteAudioNode(channel, note, realtime) {
-        const now = this.audioContext.currentTime;
+        const audioContext = this.audioContext;
+        const now = audioContext.currentTime;
         const { noteNumber, velocity, startTime } = note;
         const state = channel.state;
         const controllerState = this.getControllerState(channel, noteNumber, velocity);
@@ -930,8 +978,8 @@ export class MidyGM1 extends EventTarget {
         note.voiceParams = voiceParams;
         const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime);
         note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
-        note.volumeEnvelopeNode = new GainNode(this.audioContext);
-        note.filterNode = new BiquadFilterNode(this.audioContext, {
+        note.volumeEnvelopeNode = new GainNode(audioContext);
+        note.filterNode = new BiquadFilterNode(audioContext, {
             type: "lowpass",
             Q: voiceParams.initialFilterQ / 10, // dB
         });
@@ -990,7 +1038,12 @@ export class MidyGM1 extends EventTarget {
         const bankTable = this.soundFontTable[programNumber];
         if (!bankTable)
             return;
-        const bank = channel.isDrum ? 128 : 0;
+        let bank = channel.isDrum ? 128 : 0;
+        if (bankTable[bank] === undefined) {
+            if (channel.isDrum)
+                return;
+            bank = 0;
+        }
         const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
@@ -1014,24 +1067,24 @@ export class MidyGM1 extends EventTarget {
     }
     releaseNote(channel, note, endTime) {
         endTime ??= this.audioContext.currentTime;
-        const volRelease = endTime + note.voiceParams.volRelease;
+        const duration = note.voiceParams.volRelease * releaseTime;
+        const volRelease = endTime + duration;
         const modRelease = endTime + note.voiceParams.modRelease;
-        const stopTime = Math.min(volRelease, modRelease);
         note.filterNode.frequency
             .cancelScheduledValues(endTime)
-            .linearRampToValueAtTime(0, modRelease);
+            .linearRampToValueAtTime(note.adjustedBaseFreq, modRelease);
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
-            .linearRampToValueAtTime(0, volRelease);
+            .setTargetAtTime(0, endTime, duration * releaseCurve);
         return new Promise((resolve) => {
             this.scheduleTask(() => {
                 const bufferSource = note.bufferSource;
                 bufferSource.loop = false;
-                bufferSource.stop(stopTime);
+                bufferSource.stop(volRelease);
                 this.disconnectNote(note);
                 channel.scheduledNotes[note.index] = undefined;
                 resolve();
-            }, stopTime);
+            }, volRelease);
         });
     }
     noteOff(channelNumber, noteNumber, _velocity, endTime, force) {
@@ -1166,7 +1219,7 @@ export class MidyGM1 extends EventTarget {
     }
     setModLfoToVolume(note, scheduleTime) {
         const modLfoToVolume = note.voiceParams.modLfoToVolume;
-        const baseDepth = this.cbToRatio(Math.abs(modLfoToVolume)) - 1;
+        const baseDepth = cbToRatio(Math.abs(modLfoToVolume)) - 1;
         const volumeDepth = baseDepth * Math.sign(modLfoToVolume);
         note.volumeDepth.gain
             .cancelScheduledValues(scheduleTime)
@@ -1542,15 +1595,16 @@ export class MidyGM1 extends EventTarget {
         }
     }
     GM1SystemOn(scheduleTime) {
+        const channels = this.channels;
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
         this.mode = "GM1";
-        for (let i = 0; i < this.channels.length; i++) {
+        for (let i = 0; i < channels.length; i++) {
             this.allSoundOff(i, 0, scheduleTime);
-            const channel = this.channels[i];
+            const channel = channels[i];
             channel.isDrum = false;
         }
-        this.channels[9].isDrum = true;
+        channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
         switch (data[2]) {

package/esm/midy-GM2.d.ts

@@ -50,6 +50,8 @@ export class MidyGM2 extends EventTarget {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    totalTimeEventTypes: Set<string>;
+    tempo: number;
     loop: boolean;
     playPromise: any;
     timeline: any[];
@@ -156,7 +158,6 @@ export class MidyGM2 extends EventTarget {
         delayNodes: any[];
         feedbackGains: any[];
     };
-    cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
     centToRate(cent: any): number;
     centToHz(cent: any): number;

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":"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"}