@marmooo/midy 0.4.2 → 0.4.3

package/script/midy-GM2.js

@@ -17,6 +17,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,
@@ -228,6 +234,12 @@ const pitchEnvelopeKeys = [
     "playbackRate",
 ];
 const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
+const defaultPressureValues = new Int8Array([64, 64, 64, 0, 0, 0]);
+function cbToRatio(cb) {
+    return Math.pow(10, cb / 200);
+}
+const decayCurve = 1 / (-Math.log(cbToRatio(-1000)));
+const releaseCurve = 1 / (-Math.log(cbToRatio(-600)));
 class MidyGM2 extends EventTarget {
     constructor(audioContext) {
         super();
@@ -391,6 +403,20 @@ class MidyGM2 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,
@@ -510,13 +536,13 @@ class MidyGM2 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":
@@ -531,9 +557,9 @@ class MidyGM2 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.GM2SystemOn();
     }
@@ -542,8 +568,12 @@ class MidyGM2 extends EventTarget {
         const bankTable = this.soundFontTable[programNumber];
         if (!bankTable)
             return;
-        const bankLSB = channel.isDrum ? 128 : channel.bankLSB;
-        const bank = bankTable[bankLSB] !== undefined ? bankLSB : 0;
+        let bank = channel.isDrum ? 128 : channel.bankLSB;
+        if (bankTable[bank] === undefined) {
+            if (channel.isDrum)
+                return;
+            bank = 0;
+        }
         const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
@@ -569,7 +599,7 @@ class MidyGM2 extends EventTarget {
     resetChannelTable(channel) {
         channel.controlTable.fill(-1);
         channel.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
-        channel.channelPressureTable.fill(-1);
+        channel.channelPressureTable.set(defaultPressureValues);
         channel.keyBasedTable.fill(-1);
     }
     createChannels(audioContext) {
@@ -585,7 +615,7 @@ class MidyGM2 extends EventTarget {
                 sostenutoNotes: [],
                 controlTable: this.initControlTable(),
                 scaleOctaveTuningTable: new Int8Array(12), // [-64, 63] cent
-                channelPressureTable: new Int8Array(6).fill(-1),
+                channelPressureTable: new Int8Array(defaultPressureValues),
                 keyBasedTable: new Int8Array(128 * 128).fill(-1),
                 keyBasedGainLs: new Array(128),
                 keyBasedGainRs: new Array(128),
@@ -621,11 +651,13 @@ class MidyGM2 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);
@@ -654,8 +686,10 @@ class MidyGM2 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;
             }
         }
@@ -666,40 +700,44 @@ class MidyGM2 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"));
         }
@@ -710,49 +748,48 @@ class MidyGM2 extends EventTarget {
         let exitReason;
         this.notePromises = [];
         while (true) {
-            const now = this.audioContext.currentTime;
+            const now = audioContext.currentTime;
             if (0 < this.lastActiveSensing &&
                 this.activeSensingThreshold < performance.now() - this.lastActiveSensing) {
                 await this.stopNotes(0, true, now);
-                await this.audioContext.suspend();
+                await audioContext.suspend();
                 exitReason = "aborted";
                 break;
             }
-            if (this.timeline.length <= queueIndex) {
+            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;
@@ -765,7 +802,6 @@ class MidyGM2 extends EventTarget {
             await this.scheduleTask(() => { }, waitTime);
         }
         if (exitReason !== "paused") {
-            this.notePromises = [];
             this.resetAllStates();
             this.lastActiveSensing = 0;
         }
@@ -894,11 +930,13 @@ class MidyGM2 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)
@@ -936,11 +974,17 @@ class MidyGM2 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;
     }
@@ -1122,9 +1166,6 @@ class MidyGM2 extends EventTarget {
             feedbackGains,
         };
     }
-    cbToRatio(cb) {
-        return Math.pow(10, cb / 200);
-    }
     rateToCent(rate) {
         return 1200 * Math.log2(rate);
     }
@@ -1243,45 +1284,45 @@ class MidyGM2 extends EventTarget {
     }
     setPortamentoVolumeEnvelope(channel, note, scheduleTime) {
         const { voiceParams, startTime } = note;
-        const attackVolume = this.cbToRatio(-voiceParams.initialAttenuation) *
+        const attackVolume = cbToRatio(-voiceParams.initialAttenuation) *
             (1 + this.getAmplitudeControl(channel));
         const sustainVolume = attackVolume * (1 - voiceParams.volSustain);
-        const volDelay = startTime + voiceParams.volDelay;
-        const volAttack = volDelay + voiceParams.volAttack;
-        const volHold = volAttack + voiceParams.volHold;
+        const portamentoTime = startTime + this.getPortamentoTime(channel, note);
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(sustainVolume, volHold);
+            .linearRampToValueAtTime(sustainVolume, portamentoTime);
     }
     setVolumeEnvelope(channel, note, scheduleTime) {
         const { voiceParams, startTime } = note;
-        const attackVolume = this.cbToRatio(-voiceParams.initialAttenuation) *
+        const attackVolume = cbToRatio(-voiceParams.initialAttenuation) *
             (1 + this.getAmplitudeControl(channel));
         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);
     }
     setPortamentoPitchEnvelope(note, scheduleTime) {
         const baseRate = note.voiceParams.playbackRate;
+        const portamentoTime = note.startTime +
+            this.getPortamentoTime(channel, note);
         note.bufferSource.playbackRate
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(baseRate, scheduleTime);
+            .linearRampToValueAtTime(baseRate, portamentoTime);
     }
     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;
@@ -1291,12 +1332,12 @@ class MidyGM2 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
@@ -1305,17 +1346,18 @@ class MidyGM2 extends EventTarget {
     }
     setPortamentoFilterEnvelope(channel, note, scheduleTime) {
         const { voiceParams, startTime } = note;
-        const softPedalFactor = this.getSoftPedalFactor(channel, note);
+        const scale = this.getSoftPedalFactor(channel, note);
         const baseCent = voiceParams.initialFilterFc +
             this.getFilterCutoffControl(channel);
-        const baseFreq = this.centToHz(baseCent) * softPedalFactor;
-        const peekFreq = this.centToHz(voiceParams.initialFilterFc + voiceParams.modEnvToFilterFc) * softPedalFactor;
-        const sustainFreq = baseFreq +
-            (peekFreq - baseFreq) * (1 - voiceParams.modSustain);
-        const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
-        const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq);
+        const sustainCent = baseCent +
+            voiceParams.modEnvToFilterFc * (1 - voiceParams.modSustain);
+        const baseFreq = this.centToHz(baseCent);
+        const sustainFreq = this.centToHz(sustainCent);
+        const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq * scale);
+        const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq * scale);
         const portamentoTime = startTime + this.getPortamentoTime(channel, note);
         const modDelay = startTime + voiceParams.modDelay;
+        note.adjustedBaseFreq = adjustedSustainFreq;
         note.filterNode.frequency
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(adjustedBaseFreq, startTime)
@@ -1324,40 +1366,44 @@ class MidyGM2 extends EventTarget {
     }
     setFilterEnvelope(channel, note, scheduleTime) {
         const { voiceParams, startTime } = note;
-        const softPedalFactor = this.getSoftPedalFactor(channel, note);
+        const modEnvToFilterFc = voiceParams.modEnvToFilterFc;
         const baseCent = voiceParams.initialFilterFc +
             this.getFilterCutoffControl(channel);
+        const peekCent = baseCent + modEnvToFilterFc;
+        const sustainCent = baseCent +
+            modEnvToFilterFc * (1 - voiceParams.modSustain);
+        const softPedalFactor = this.getSoftPedalFactor(channel, note);
         const baseFreq = this.centToHz(baseCent) * softPedalFactor;
-        const peekFreq = this.centToHz(baseCent + voiceParams.modEnvToFilterFc) *
-            softPedalFactor;
-        const sustainFreq = baseFreq +
-            (peekFreq - baseFreq) * (1 - voiceParams.modSustain);
+        const peekFreq = this.centToHz(peekCent) * softPedalFactor;
+        const sustainFreq = this.centToHz(sustainCent) * softPedalFactor;
         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);
@@ -1410,7 +1456,8 @@ class MidyGM2 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);
@@ -1418,8 +1465,8 @@ class MidyGM2 extends EventTarget {
         note.voiceParams = voiceParams;
         const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime);
         note.bufferSource = this.createBufferSource(channel, noteNumber, 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
         });
@@ -1532,8 +1579,12 @@ class MidyGM2 extends EventTarget {
         const bankTable = this.soundFontTable[programNumber];
         if (!bankTable)
             return;
-        const bankLSB = channel.isDrum ? 128 : channel.bankLSB;
-        const bank = bankTable[bankLSB] !== undefined ? bankLSB : 0;
+        let bank = channel.isDrum ? 128 : channel.bankLSB;
+        if (bankTable[bank] === undefined) {
+            if (channel.isDrum)
+                return;
+            bank = 0;
+        }
         const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
@@ -1567,24 +1618,24 @@ class MidyGM2 extends EventTarget {
     }
     releaseNote(channel, note, endTime) {
         endTime ??= this.audioContext.currentTime;
-        const volRelease = endTime + note.voiceParams.volRelease;
+        const duration = note.voiceParams.volRelease;
+        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) {
@@ -1706,6 +1757,8 @@ class MidyGM2 extends EventTarget {
         }
     }
     setChannelPressure(channelNumber, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
@@ -1779,7 +1832,7 @@ class MidyGM2 extends EventTarget {
     }
     setModLfoToVolume(channel, 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) *
             (1 + this.getLFOAmplitudeDepth(channel));
         note.volumeDepth.gain
@@ -2467,32 +2520,34 @@ class MidyGM2 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.bankMSB = 0;
             channel.bankLSB = 0;
             channel.isDrum = false;
         }
-        this.channels[9].bankMSB = 1;
-        this.channels[9].isDrum = true;
+        channels[9].bankMSB = 1;
+        channels[9].isDrum = true;
     }
     GM2SystemOn(scheduleTime) {
+        const channels = this.channels;
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
         this.mode = "GM2";
-        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.bankMSB = 121;
             channel.bankLSB = 0;
             channel.isDrum = false;
         }
-        this.channels[9].bankMSB = 120;
-        this.channels[9].isDrum = true;
+        channels[9].bankMSB = 120;
+        channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
         switch (data[2]) {
@@ -2806,9 +2861,9 @@ class MidyGM2 extends EventTarget {
     getAmplitudeControl(channel) {
         const channelPressureRaw = channel.channelPressureTable[2];
         const channelPressure = (0 <= channelPressureRaw)
-            ? channelPressureRaw * channel.state.channelPressure
+            ? channel.state.channelPressure * 127 / channelPressureRaw
             : 0;
-        return channelPressure / 64;
+        return channelPressure;
     }
     getLFOPitchDepth(channel) {
         const channelPressureRaw = channel.channelPressureTable[3];
@@ -2832,27 +2887,27 @@ class MidyGM2 extends EventTarget {
         return channelPressure / 127;
     }
     setEffects(channel, note, table, scheduleTime) {
-        if (0 <= table[0])
+        if (0 < table[0])
             this.updateDetune(channel, note, scheduleTime);
         if (0.5 <= channel.state.portamemento && 0 <= note.portamentoNoteNumber) {
-            if (0 <= table[1]) {
+            if (0 < table[1]) {
                 this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
             }
-            if (0 <= table[2]) {
+            if (0 < table[2]) {
                 this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
             }
         }
         else {
-            if (0 <= table[1])
+            if (0 < table[1])
                 this.setFilterEnvelope(channel, note, scheduleTime);
-            if (0 <= table[2])
+            if (0 < table[2])
                 this.setVolumeEnvelope(channel, note, scheduleTime);
         }
-        if (0 <= table[3])
+        if (0 < table[3])
             this.setModLfoToPitch(channel, note, scheduleTime);
-        if (0 <= table[4])
+        if (0 < table[4])
             this.setModLfoToFilterFc(channel, note, scheduleTime);
-        if (0 <= table[5])
+        if (0 < table[5])
             this.setModLfoToVolume(channel, note, scheduleTime);
     }
     handlePressureSysEx(data, tableName, scheduleTime) {

package/script/midy-GMLite.d.ts

@@ -29,6 +29,8 @@ export class MidyGMLite extends EventTarget {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    totalTimeEventTypes: Set<string>;
+    tempo: number;
     loop: boolean;
     playPromise: any;
     timeline: any[];
@@ -93,7 +95,6 @@ export class MidyGMLite 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;
@@ -113,13 +114,13 @@ export class MidyGMLite extends EventTarget {
     noteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     disconnectNote(note: any): void;
     releaseNote(channel: any, note: any, endTime: any): Promise<any>;
-    noteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): Promise<any>;
+    noteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): any;
     setNoteIndex(channel: any, index: any): void;
     findNoteOffIndex(channel: any, noteNumber: any): any;
-    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): Promise<any>[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): any[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
-    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
+    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): any;
     setProgramChange(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;