@marmooo/midy 0.4.2 → 0.4.4

package/esm/midy-GMLite.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,
@@ -160,9 +166,24 @@ 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 MidyGMLite extends EventTarget {
     constructor(audioContext) {
         super();
+        // https://pmc.ncbi.nlm.nih.gov/articles/PMC4191557/
+        // https://pubmed.ncbi.nlm.nih.gov/12488797/
+        // Gap detection studies indicate humans detect temporal discontinuities
+        // around 2–3 ms. Smoothing over ~4 ms is perceived as continuous.
+        Object.defineProperty(this, "perceptualSmoothingTime", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0.004
+        });
         Object.defineProperty(this, "mode", {
             enumerable: true,
             configurable: true,
@@ -277,6 +298,20 @@ export class MidyGMLite 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,
@@ -391,13 +426,13 @@ export class MidyGMLite 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":
@@ -412,9 +447,9 @@ export class MidyGMLite 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();
     }
@@ -423,7 +458,12 @@ export class MidyGMLite 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;
@@ -483,11 +523,13 @@ export class MidyGMLite 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);
@@ -513,8 +555,10 @@ export class MidyGMLite 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;
             }
         }
@@ -525,40 +569,44 @@ export class MidyGMLite 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"));
         }
@@ -569,42 +617,41 @@ export class MidyGMLite 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;
@@ -617,7 +664,6 @@ export class MidyGMLite extends EventTarget {
             await this.scheduleTask(() => { }, waitTime);
         }
         if (exitReason !== "paused") {
-            this.notePromises = [];
             this.resetAllStates();
         }
         this.isPlaying = false;
@@ -715,11 +761,13 @@ export class MidyGMLite 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)
@@ -756,12 +804,25 @@ export class MidyGMLite extends EventTarget {
             this.isSeeking = true;
         }
     }
+    tempoChange(tempo) {
+        const timeScale = this.tempo / tempo;
+        this.resumeTime = this.resumeTime * timeScale;
+        this.tempo = tempo;
+        this.totalTime = this.calcTotalTime();
+        this.seekTo(this.currentTime() * timeScale);
+    }
     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;
     }
@@ -801,9 +862,6 @@ export class MidyGMLite extends EventTarget {
         }
         await Promise.all(tasks);
     }
-    cbToRatio(cb) {
-        return Math.pow(10, cb / 200);
-    }
     rateToCent(rate) {
         return 1200 * Math.log2(rate);
     }
@@ -820,51 +878,57 @@ export class MidyGMLite extends EventTarget {
     }
     updateChannelDetune(channel, scheduleTime) {
         this.processScheduledNotes(channel, (note) => {
-            this.updateDetune(channel, note, scheduleTime);
+            this.setDetune(channel, note, scheduleTime);
         });
     }
-    updateDetune(channel, note, scheduleTime) {
-        note.bufferSource.detune
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(channel.detune, scheduleTime);
+    calcNoteDetune(channel, note) {
+        return channel.detune + note.voiceParams.detune;
     }
     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
+            .setValueAtTime(1e-6, volDelay)
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
-            .linearRampToValueAtTime(sustainVolume, volDecay);
+            .setTargetAtTime(sustainVolume, volHold, decayDuration * decayCurve);
+    }
+    setDetune(channel, note, scheduleTime) {
+        const detune = this.calcNoteDetune(channel, note);
+        note.bufferSource.detune
+            .cancelScheduledValues(scheduleTime)
+            .setValueAtTime(detune, scheduleTime);
+        const timeConstant = this.perceptualSmoothingTime / 5; // 99.3% (5 * tau)
+        note.bufferSource.detune
+            .cancelAndHoldAtTime(scheduleTime)
+            .setTargetAtTime(detune, scheduleTime, timeConstant);
     }
     setPitchEnvelope(note, scheduleTime) {
-        const { voiceParams } = note;
+        const { bufferSource, voiceParams } = note;
         const baseRate = voiceParams.playbackRate;
-        note.bufferSource.playbackRate
+        bufferSource.playbackRate
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(baseRate, scheduleTime);
         const modEnvToPitch = voiceParams.modEnvToPitch;
         if (modEnvToPitch === 0)
             return;
-        const basePitch = this.rateToCent(baseRate);
-        const peekPitch = basePitch + modEnvToPitch;
-        const peekRate = this.centToRate(peekPitch);
+        const peekRate = baseRate * this.centToRate(modEnvToPitch);
         const modDelay = note.startTime + voiceParams.modDelay;
         const modAttack = modDelay + voiceParams.modAttack;
         const modHold = modAttack + voiceParams.modHold;
-        const modDecay = modHold + voiceParams.modDecay;
-        note.bufferSource.playbackRate
+        const decayDuration = voiceParams.modDecay;
+        bufferSource.playbackRate
             .setValueAtTime(baseRate, modDelay)
             .exponentialRampToValueAtTime(peekRate, modAttack)
             .setValueAtTime(peekRate, modHold)
-            .linearRampToValueAtTime(baseRate, modDecay);
+            .setTargetAtTime(baseRate, modHold, decayDuration * decayCurve);
     }
     clampCutoffFrequency(frequency) {
         const minFrequency = 20; // min Hz of initialFilterFc
@@ -873,36 +937,42 @@ export class MidyGMLite 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)
             .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);
@@ -941,7 +1011,8 @@ export class MidyGMLite 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);
@@ -949,15 +1020,15 @@ export class MidyGMLite extends EventTarget {
         note.voiceParams = voiceParams;
         const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime);
         note.bufferSource = this.createBufferSource(channel, 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
         });
         this.setVolumeEnvelope(note, now);
         this.setFilterEnvelope(note, now);
         this.setPitchEnvelope(note, now);
-        this.updateDetune(channel, note, now);
+        this.setDetune(channel, note, now);
         if (0 < state.modulationDepthMSB) {
             this.startModulation(channel, note, now);
         }
@@ -1025,7 +1096,12 @@ export class MidyGMLite 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;
@@ -1049,27 +1125,26 @@ export class MidyGMLite extends EventTarget {
     }
     releaseNote(channel, note, endTime) {
         endTime ??= this.audioContext.currentTime;
-        const volRelease = endTime + note.voiceParams.volRelease;
-        const modRelease = endTime + note.voiceParams.modRelease;
-        const stopTime = Math.min(volRelease, modRelease);
+        const volDuration = note.voiceParams.volRelease;
+        const volRelease = endTime + volDuration;
         note.filterNode.frequency
             .cancelScheduledValues(endTime)
-            .linearRampToValueAtTime(0, modRelease);
+            .setTargetAtTime(note.adjustedBaseFreq, endTime, note.voiceParams.modRelease * releaseCurve);
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
-            .linearRampToValueAtTime(0, volRelease);
+            .setTargetAtTime(0, endTime, volDuration * 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);
         });
     }
-    async noteOff(channelNumber, noteNumber, _velocity, endTime, force) {
+    noteOff(channelNumber, noteNumber, _velocity, endTime, force) {
         const channel = this.channels[channelNumber];
         if (!force) {
             if (channel.isDrum)
@@ -1205,7 +1280,7 @@ export class MidyGMLite 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)
@@ -1251,12 +1326,15 @@ export class MidyGMLite extends EventTarget {
                 }
             },
             freqModLFO: (_channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setFreqModLFO(note, scheduleTime);
                 }
             },
             delayVibLFO: (_channel, _note, _scheduleTime) => { },
             freqVibLFO: (_channel, _note, _scheduleTime) => { },
+            detune: (channel, note, scheduleTime) => {
+                this.setDetune(channel, note, scheduleTime);
+            },
         };
     }
     getControllerState(channel, noteNumber, velocity) {
@@ -1326,7 +1404,8 @@ export class MidyGMLite extends EventTarget {
         }
     }
     updateModulation(channel, scheduleTime) {
-        const depth = channel.state.modulationDepth * channel.modulationDepthRange;
+        const depth = channel.state.modulationDepthMSB *
+            channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
@@ -1336,18 +1415,18 @@ export class MidyGMLite extends EventTarget {
             }
         });
     }
-    setModulationDepth(channelNumber, modulation, scheduleTime) {
+    setModulationDepth(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
-        channel.state.modulationDepth = modulation / 127;
+        channel.state.modulationDepthMSB = value / 127;
         this.updateModulation(channel, scheduleTime);
     }
-    setVolume(channelNumber, volume, scheduleTime) {
+    setVolume(channelNumber, value, scheduleTime) {
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.volume = volume / 127;
+        channel.state.volumeMSB = value / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     panToGain(pan) {
@@ -1357,18 +1436,18 @@ export class MidyGMLite extends EventTarget {
             gainRight: Math.sin(theta),
         };
     }
-    setPan(channelNumber, pan, scheduleTime) {
+    setPan(channelNumber, value, scheduleTime) {
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.pan = pan / 127;
+        channel.state.panMSB = value / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
-    setExpression(channelNumber, expression, scheduleTime) {
+    setExpression(channelNumber, value, scheduleTime) {
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.expression = expression / 127;
+        channel.state.expressionMSB = value / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     dataEntryLSB(channelNumber, value, scheduleTime) {
@@ -1377,14 +1456,14 @@ export class MidyGMLite extends EventTarget {
     }
     updateChannelVolume(channel, scheduleTime) {
         const state = channel.state;
-        const volume = state.volume * state.expression;
-        const { gainLeft, gainRight } = this.panToGain(state.pan);
+        const gain = state.volumeMSB * state.expressionMSB;
+        const { gainLeft, gainRight } = this.panToGain(state.panMSB);
         channel.gainL.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainLeft, scheduleTime);
+            .setValueAtTime(gain * gainLeft, scheduleTime);
         channel.gainR.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainRight, scheduleTime);
+            .setValueAtTime(gain * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -1425,6 +1504,8 @@ export class MidyGMLite extends EventTarget {
             case 0:
                 this.handlePitchBendRangeRPN(channelNumber, scheduleTime);
                 break;
+            case 16383: // NULL
+                break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
@@ -1533,15 +1614,16 @@ export class MidyGMLite 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]) {