@marmooo/midy 0.4.0 → 0.4.2

package/esm/midy.js

@@ -26,12 +26,6 @@ class Note {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "pending", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: true
-        });
         Object.defineProperty(this, "bufferSource", {
             enumerable: true,
             configurable: true,
@@ -113,6 +107,9 @@ class Note {
         this.noteNumber = noteNumber;
         this.velocity = velocity;
         this.startTime = startTime;
+        this.ready = new Promise((resolve) => {
+            this.resolveReady = resolve;
+        });
     }
 }
 const drumExclusiveClassesByKit = new Array(57);
@@ -158,14 +155,19 @@ const defaultControllerState = {
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
     link: { type: 127, defaultValue: 0 },
     // bankMSB: { type: 128 + 0, defaultValue: 121, },
-    modulationDepth: { type: 128 + 1, defaultValue: 0 },
-    portamentoTime: { type: 128 + 5, defaultValue: 0 },
+    modulationDepthMSB: { type: 128 + 1, defaultValue: 0 },
+    portamentoTimeMSB: { type: 128 + 5, defaultValue: 0 },
     // dataMSB: { type: 128 + 6, defaultValue: 0, },
-    volume: { type: 128 + 7, defaultValue: 100 / 127 },
-    pan: { type: 128 + 10, defaultValue: 64 / 127 },
-    expression: { type: 128 + 11, defaultValue: 1 },
+    volumeMSB: { type: 128 + 7, defaultValue: 100 / 127 },
+    panMSB: { type: 128 + 10, defaultValue: 64 / 127 },
+    expressionMSB: { type: 128 + 11, defaultValue: 1 },
     // bankLSB: { type: 128 + 32, defaultValue: 0, },
+    modulationDepthLSB: { type: 128 + 33, defaultValue: 0 },
+    portamentoTimeLSB: { type: 128 + 37, defaultValue: 0 },
     // dataLSB: { type: 128 + 38, defaultValue: 0, },
+    volumeLSB: { type: 128 + 39, defaultValue: 0 },
+    panLSB: { type: 128 + 42, defaultValue: 0 },
+    expressionLSB: { type: 128 + 43, defaultValue: 0 },
     sustainPedal: { type: 128 + 64, defaultValue: 0 },
     portamento: { type: 128 + 65, defaultValue: 0 },
     sostenutoPedal: { type: 128 + 66, defaultValue: 0 },
@@ -178,12 +180,14 @@ const defaultControllerState = {
     vibratoRate: { type: 128 + 76, defaultValue: 64 / 127 },
     vibratoDepth: { type: 128 + 77, defaultValue: 64 / 127 },
     vibratoDelay: { type: 128 + 78, defaultValue: 64 / 127 },
+    portamentoNoteNumber: { type: 128 + 84, defaultValue: 0 },
     reverbSendLevel: { type: 128 + 91, defaultValue: 0 },
     chorusSendLevel: { type: 128 + 93, defaultValue: 0 },
     // dataIncrement: { type: 128 + 96, defaultValue: 0 },
     // dataDecrement: { type: 128 + 97, defaultValue: 0 },
     // rpnLSB: { type: 128 + 100, defaultValue: 127 },
     // rpnMSB: { type: 128 + 101, defaultValue: 127 },
+    // rpgMakerLoop: { type: 128 + 111, defaultValue: 0 },
     // allSoundOff: { type: 128 + 120, defaultValue: 0 },
     // resetAllControllers: { type: 128 + 121, defaultValue: 0 },
     // allNotesOff: { type: 128 + 123, defaultValue: 0 },
@@ -243,8 +247,9 @@ const pitchEnvelopeKeys = [
     "playbackRate",
 ];
 const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
-export class Midy {
+export class Midy extends EventTarget {
     constructor(audioContext) {
+        super();
         Object.defineProperty(this, "mode", {
             enumerable: true,
             configurable: true,
@@ -405,6 +410,18 @@ export class Midy {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "loop", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "loopStart", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
         Object.defineProperty(this, "playPromise", {
             enumerable: true,
             configurable: true,
@@ -561,7 +578,7 @@ export class Midy {
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
+        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.panMSB.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
@@ -604,10 +621,9 @@ export class Midy {
         return channels;
     }
     async createAudioBuffer(voiceParams) {
-        const sample = voiceParams.sample;
-        const sampleStart = voiceParams.start;
-        const sampleEnd = sample.data.length + voiceParams.end;
-        const audioBuffer = await sample.toAudioBuffer(this.audioContext, sampleStart, sampleEnd);
+        const { sample, start, end } = voiceParams;
+        const sampleEnd = sample.data.length + end;
+        const audioBuffer = await sample.toAudioBuffer(this.audioContext, start, sampleEnd);
         return audioBuffer;
     }
     isLoopDrum(channel, noteNumber) {
@@ -627,7 +643,7 @@ export class Midy {
         }
         return bufferSource;
     }
-    async scheduleTimelineEvents(scheduleTime, queueIndex) {
+    scheduleTimelineEvents(scheduleTime, queueIndex) {
         const timeOffset = this.resumeTime - this.startTime;
         const lookAheadCheckTime = scheduleTime + timeOffset + this.lookAhead;
         const schedulingOffset = this.startDelay - timeOffset;
@@ -639,12 +655,10 @@ export class Midy {
             const startTime = event.startTime + schedulingOffset;
             switch (event.type) {
                 case "noteOn":
-                    await this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
+                    this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
                     break;
                 case "noteOff": {
-                    const notePromise = this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
-                    if (notePromise)
-                        this.notePromises.push(notePromise);
+                    this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     break;
                 }
                 case "noteAftertouch":
@@ -688,22 +702,23 @@ export class Midy {
         }
     }
     updateStates(queueIndex, nextQueueIndex) {
+        const now = this.audioContext.currentTime;
         if (nextQueueIndex < queueIndex)
             queueIndex = 0;
         for (let i = queueIndex; i < nextQueueIndex; i++) {
             const event = this.timeline[i];
             switch (event.type) {
                 case "controller":
-                    this.setControlChange(event.channel, event.controllerType, event.value, 0);
+                    this.setControlChange(event.channel, event.controllerType, event.value, now - this.resumeTime + event.startTime);
                     break;
                 case "programChange":
-                    this.setProgramChange(event.channel, event.programNumber, 0);
+                    this.setProgramChange(event.channel, event.programNumber, now - this.resumeTime + event.startTime);
                     break;
                 case "pitchBend":
-                    this.setPitchBend(event.channel, event.value + 8192, 0);
+                    this.setPitchBend(event.channel, event.value + 8192, now - this.resumeTime + event.startTime);
                     break;
                 case "sysEx":
-                    this.handleSysEx(event.data, 0);
+                    this.handleSysEx(event.data, now - this.resumeTime + event.startTime);
             }
         }
     }
@@ -711,52 +726,95 @@ export class Midy {
         if (this.audioContext.state === "suspended") {
             await this.audioContext.resume();
         }
+        const paused = this.isPaused;
         this.isPlaying = true;
         this.isPaused = false;
         this.startTime = this.audioContext.currentTime;
+        if (paused) {
+            this.dispatchEvent(new Event("resumed"));
+        }
+        else {
+            this.dispatchEvent(new Event("started"));
+        }
         let queueIndex = this.getQueueIndex(this.resumeTime);
-        let finished = false;
+        let exitReason;
         this.notePromises = [];
-        while (queueIndex < this.timeline.length) {
+        while (true) {
             const now = this.audioContext.currentTime;
             if (0 < this.lastActiveSensing &&
                 this.activeSensingThreshold < performance.now() - this.lastActiveSensing) {
                 await this.stopNotes(0, true, now);
                 await this.audioContext.suspend();
-                finished = true;
+                exitReason = "aborted";
                 break;
             }
+            if (this.timeline.length <= queueIndex) {
+                await this.stopNotes(0, true, now);
+                if (this.loop) {
+                    this.notePromises = [];
+                    this.resetAllStates();
+                    this.startTime = this.audioContext.currentTime;
+                    this.resumeTime = this.loopStart;
+                    if (0 < this.loopStart) {
+                        const nextQueueIndex = this.getQueueIndex(this.resumeTime);
+                        this.updateStates(queueIndex, nextQueueIndex);
+                        queueIndex = nextQueueIndex;
+                    }
+                    else {
+                        queueIndex = 0;
+                    }
+                    this.dispatchEvent(new Event("looped"));
+                    continue;
+                }
+                else {
+                    await this.audioContext.suspend();
+                    exitReason = "ended";
+                    break;
+                }
+            }
             if (this.isPausing) {
                 await this.stopNotes(0, true, now);
                 await this.audioContext.suspend();
                 this.notePromises = [];
+                this.isPausing = false;
+                exitReason = "paused";
                 break;
             }
             else if (this.isStopping) {
                 await this.stopNotes(0, true, now);
                 await this.audioContext.suspend();
-                finished = true;
+                this.isStopping = false;
+                exitReason = "stopped";
                 break;
             }
             else if (this.isSeeking) {
-                await this.stopNotes(0, true, now);
+                this.stopNotes(0, true, now);
                 this.startTime = this.audioContext.currentTime;
                 const nextQueueIndex = this.getQueueIndex(this.resumeTime);
                 this.updateStates(queueIndex, nextQueueIndex);
                 queueIndex = nextQueueIndex;
                 this.isSeeking = false;
+                this.dispatchEvent(new Event("seeked"));
                 continue;
             }
-            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
+            queueIndex = this.scheduleTimelineEvents(now, queueIndex);
             const waitTime = now + this.noteCheckInterval;
             await this.scheduleTask(() => { }, waitTime);
         }
-        if (finished) {
+        if (exitReason !== "paused") {
             this.notePromises = [];
             this.resetAllStates();
             this.lastActiveSensing = 0;
         }
         this.isPlaying = false;
+        if (exitReason === "paused") {
+            this.isPaused = true;
+            this.dispatchEvent(new Event("paused"));
+        }
+        else {
+            this.isPaused = false;
+            this.dispatchEvent(new Event(exitReason));
+        }
     }
     ticksToSecond(ticks, secondsPerBeat) {
         return ticks * secondsPerBeat / this.ticksPerBeat;
@@ -893,24 +951,20 @@ export class Midy {
             return;
         this.isStopping = true;
         await this.playPromise;
-        this.isStopping = false;
     }
     async pause() {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
-        this.resumeTime = now - this.startTime - this.startDelay;
+        this.resumeTime = now + this.resumeTime - this.startTime;
         this.isPausing = true;
         await this.playPromise;
-        this.isPausing = false;
-        this.isPaused = true;
     }
     async resume() {
         if (!this.isPaused)
             return;
         this.playPromise = this.playNotes();
         await this.playPromise;
-        this.isPaused = false;
     }
     seekTo(second) {
         this.resumeTime = second;
@@ -933,19 +987,23 @@ export class Midy {
         const now = this.audioContext.currentTime;
         return now + this.resumeTime - this.startTime;
     }
-    processScheduledNotes(channel, callback) {
+    async processScheduledNotes(channel, callback) {
         const scheduledNotes = channel.scheduledNotes;
+        const tasks = [];
         for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
                 continue;
             if (note.ending)
                 continue;
-            callback(note);
+            const task = note.ready.then(() => callback(note));
+            tasks.push(task);
         }
+        await Promise.all(tasks);
     }
-    processActiveNotes(channel, scheduleTime, callback) {
+    async processActiveNotes(channel, scheduleTime, callback) {
         const scheduledNotes = channel.scheduledNotes;
+        const tasks = [];
         for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
@@ -954,8 +1012,10 @@ export class Midy {
                 continue;
             if (scheduleTime < note.startTime)
                 break;
-            callback(note);
+            const task = note.ready.then(() => callback(note));
+            tasks.push(task);
         }
+        await Promise.all(tasks);
     }
     createConvolutionReverbImpulse(audioContext, decay, preDecay) {
         const sampleRate = audioContext.sampleRate;
@@ -1143,6 +1203,13 @@ export class Midy {
         const noteDetune = this.calcNoteDetune(channel, note);
         const pitchControl = this.getPitchControl(channel, note);
         const detune = channel.detune + noteDetune + pitchControl;
+        if (channel.portamentoControl) {
+            const state = channel.state;
+            const portamentoNoteNumber = Math.ceil(state.portamentoNoteNumber * 127);
+            note.portamentoNoteNumber = portamentoNoteNumber;
+            channel.portamentoControl = false;
+            state.portamentoNoteNumber = 0;
+        }
         if (this.isPortamento(channel, note)) {
             const startTime = note.startTime;
             const deltaCent = (note.noteNumber - note.portamentoNoteNumber) * 100;
@@ -1159,8 +1226,10 @@ export class Midy {
         }
     }
     getPortamentoTime(channel, note) {
+        const { portamentoTimeMSB, portamentoTimeLSB } = channel.state;
+        const portamentoTime = portamentoTimeMSB + portamentoTimeLSB / 128;
         const deltaSemitone = Math.abs(note.noteNumber - note.portamentoNoteNumber);
-        const value = Math.ceil(channel.state.portamentoTime * 127);
+        const value = Math.ceil(portamentoTime * 128);
         return deltaSemitone / this.getPitchIncrementSpeed(value) / 10;
     }
     getPitchIncrementSpeed(value) {
@@ -1424,7 +1493,7 @@ export class Midy {
         if (0 < state.vibratoDepth) {
             this.startVibrato(channel, note, now);
         }
-        if (0 < state.modulationDepth) {
+        if (0 < state.modulationDepthMSB + state.modulationDepthLSB) {
             this.startModulation(channel, note, now);
         }
         if (channel.mono && channel.currentBufferSource) {
@@ -1435,7 +1504,13 @@ export class Midy {
         note.filterNode.connect(note.volumeEnvelopeNode);
         this.setChorusSend(channel, note, now);
         this.setReverbSend(channel, note, now);
-        note.bufferSource.start(startTime);
+        if (voiceParams.sample.type === "compressed") {
+            const offset = voiceParams.start / audioBuffer.sampleRate;
+            note.bufferSource.start(startTime, offset);
+        }
+        else {
+            note.bufferSource.start(startTime);
+        }
         return note;
     }
     handleExclusiveClass(note, channelNumber, startTime) {
@@ -1520,11 +1595,7 @@ export class Midy {
             return;
         await this.setNoteAudioNode(channel, note, realtime);
         this.setNoteRouting(channelNumber, note, startTime);
-        note.pending = false;
-        const off = note.offEvent;
-        if (off) {
-            this.noteOff(channelNumber, noteNumber, off.velocity, off.startTime);
-        }
+        note.resolveReady();
     }
     disconnectNote(note) {
         note.bufferSource.disconnect();
@@ -1569,7 +1640,7 @@ export class Midy {
             }, stopTime);
         });
     }
-    noteOff(channelNumber, noteNumber, velocity, endTime, force) {
+    noteOff(channelNumber, noteNumber, _velocity, endTime, force) {
         const channel = this.channels[channelNumber];
         const state = channel.state;
         if (!force) {
@@ -1588,13 +1659,13 @@ export class Midy {
         if (index < 0)
             return;
         const note = channel.scheduledNotes[index];
-        if (note.pending) {
-            note.offEvent = { velocity, startTime: endTime };
-            return;
-        }
         note.ending = true;
         this.setNoteIndex(channel, index);
-        this.releaseNote(channel, note, endTime);
+        const promise = note.ready.then(() => {
+            return this.releaseNote(channel, note, endTime);
+        });
+        this.notePromises.push(promise);
+        return promise;
     }
     setNoteIndex(channel, index) {
         let allEnds = true;
@@ -1693,7 +1764,7 @@ export class Midy {
                 this.setEffects(channel, note, table, scheduleTime);
             }
         });
-        this.applyVoiceParams(channel, 10);
+        this.applyVoiceParams(channel, 10, scheduleTime);
     }
     setProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -1726,7 +1797,7 @@ export class Midy {
         this.processActiveNotes(channel, scheduleTime, (note) => {
             this.setEffects(channel, note, table, scheduleTime);
         });
-        this.applyVoiceParams(channel, 13);
+        this.applyVoiceParams(channel, 13, scheduleTime);
     }
     handlePitchBendMessage(channelNumber, lsb, msb, scheduleTime) {
         const pitchBend = msb * 128 + lsb;
@@ -1736,7 +1807,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheel * 2 - 1;
         const next = (value - 8192) / 8192;
@@ -1747,9 +1819,11 @@ export class Midy {
     }
     setModLfoToPitch(channel, note, scheduleTime) {
         if (note.modulationDepth) {
+            const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+            const modulationDepth = modulationDepthMSB + modulationDepthLSB / 128;
             const modLfoToPitch = note.voiceParams.modLfoToPitch +
                 this.getLFOPitchDepth(channel, note);
-            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
+            const baseDepth = Math.abs(modLfoToPitch) + modulationDepth;
             const depth = baseDepth * Math.sign(modLfoToPitch);
             note.modulationDepth.gain
                 .cancelScheduledValues(scheduleTime)
@@ -1882,7 +1956,8 @@ export class Midy {
     createVoiceParamsHandlers() {
         return {
             modLfoToPitch: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
@@ -1892,12 +1967,14 @@ export class Midy {
                 }
             },
             modLfoToFilterFc: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setModLfoToFilterFc(channel, note, scheduleTime);
                 }
             },
             modLfoToVolume: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setModLfoToVolume(channel, note, scheduleTime);
                 }
             },
@@ -1908,12 +1985,14 @@ export class Midy {
                 this.setReverbSend(channel, note, scheduleTime);
             },
             delayModLFO: (_channel, note, _scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setDelayModLFO(note);
                 }
             },
             freqModLFO: (_channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setFreqModLFO(note, scheduleTime);
                 }
             },
@@ -1982,7 +2061,12 @@ export class Midy {
         handlers[10] = this.setPan;
         handlers[11] = this.setExpression;
         handlers[32] = this.setBankLSB;
+        handlers[33] = this.setModulationDepth;
+        handlers[37] = this.setPortamentoTime;
         handlers[38] = this.dataEntryLSB;
+        handlers[39] = this.setVolume;
+        handlers[42] = this.setPan;
+        handlers[43] = this.setExpression;
         handlers[64] = this.setSustainPedal;
         handlers[65] = this.setPortamento;
         handlers[66] = this.setSostenutoPedal;
@@ -1995,12 +2079,14 @@ export class Midy {
         handlers[76] = this.setVibratoRate;
         handlers[77] = this.setVibratoDepth;
         handlers[78] = this.setVibratoDelay;
+        handlers[84] = this.setPortamentoNoteNumber;
         handlers[91] = this.setReverbSendLevel;
         handlers[93] = this.setChorusSendLevel;
         handlers[96] = this.dataIncrement;
         handlers[97] = this.dataDecrement;
         handlers[100] = this.setRPNLSB;
         handlers[101] = this.setRPNMSB;
+        handlers[111] = this.setRPGMakerLoop;
         handlers[120] = this.allSoundOff;
         handlers[121] = this.resetAllControllers;
         handlers[123] = this.allNotesOff;
@@ -2026,7 +2112,9 @@ export class Midy {
         this.channels[channelNumber].bankMSB = msb;
     }
     updateModulation(channel, scheduleTime) {
-        const depth = channel.state.modulationDepth * channel.modulationDepthRange;
+        const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+        const modulationDepth = modulationDepthMSB + modulationDepthLSB / 128;
+        const depth = modulationDepth * channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
@@ -2036,12 +2124,16 @@ export class Midy {
             }
         });
     }
-    setModulationDepth(channelNumber, modulation, scheduleTime) {
+    setModulationDepth(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
-        channel.state.modulationDepth = modulation / 127;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.modulationDepthMSB = intPart / 127;
+        state.modulationDepthLSB = value - intPart;
         this.updateModulation(channel, scheduleTime);
     }
     updatePortamento(channel, scheduleTime) {
@@ -2062,18 +2154,26 @@ export class Midy {
             }
         });
     }
-    setPortamentoTime(channelNumber, portamentoTime, scheduleTime) {
+    setPortamentoTime(channelNumber, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
-        channel.state.portamentoTime = portamentoTime / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.portamentoTimeMSB = intPart / 127;
+        state.portamentoTimeLSB = value - 127;
         if (channel.isDrum)
             return;
         this.updatePortamento(channel, scheduleTime);
     }
-    setVolume(channelNumber, volume, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+    setVolume(channelNumber, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.volume = volume / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.volumeMSB = intPart / 127;
+        state.volumeLSB = value - intPart;
         if (channel.isDrum) {
             for (let i = 0; i < 128; i++) {
                 this.updateKeyBasedVolume(channel, i, scheduleTime);
@@ -2084,16 +2184,20 @@ export class Midy {
         }
     }
     panToGain(pan) {
-        const theta = Math.PI / 2 * Math.max(0, pan * 127 - 1) / 126;
+        const theta = Math.PI / 2 * Math.max(pan * 127 - 1) / 126;
         return {
             gainLeft: Math.cos(theta),
             gainRight: Math.sin(theta),
         };
     }
-    setPan(channelNumber, pan, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+    setPan(channelNumber, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.pan = pan / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.panMSB = intPart / 127;
+        state.panLSB = value - intPart;
         if (channel.isDrum) {
             for (let i = 0; i < 128; i++) {
                 this.updateKeyBasedVolume(channel, i, scheduleTime);
@@ -2103,10 +2207,14 @@ export class Midy {
             this.updateChannelVolume(channel, scheduleTime);
         }
     }
-    setExpression(channelNumber, expression, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+    setExpression(channelNumber, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.expression = expression / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.expressionMSB = intPart / 127;
+        state.expressionLSB = value - intPart;
         this.updateChannelVolume(channel, scheduleTime);
     }
     setBankLSB(channelNumber, lsb) {
@@ -2117,43 +2225,49 @@ export class Midy {
         this.handleRPN(channelNumber, 0, scheduleTime);
     }
     updateChannelVolume(channel, scheduleTime) {
-        const state = channel.state;
-        const volume = state.volume * state.expression;
-        const { gainLeft, gainRight } = this.panToGain(state.pan);
+        const { expressionMSB, expressionLSB, volumeMSB, volumeLSB, panMSB, panLSB, } = channel.state;
+        const volume = volumeMSB + volumeLSB / 128;
+        const expression = expressionMSB + expressionLSB / 128;
+        const pan = panMSB + panLSB / 128;
+        const gain = volume * expression;
+        const { gainLeft, gainRight } = this.panToGain(pan);
         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);
     }
     updateKeyBasedVolume(channel, keyNumber, scheduleTime) {
         const gainL = channel.keyBasedGainLs[keyNumber];
         if (!gainL)
             return;
         const gainR = channel.keyBasedGainRs[keyNumber];
-        const state = channel.state;
-        const defaultVolume = state.volume * state.expression;
-        const defaultPan = state.pan;
+        const { expressionMSB, expressionLSB, volumeMSB, volumeLSB, panMSB, panLSB, } = channel.state;
+        const volume = volumeMSB + volumeLSB / 128;
+        const expression = expressionMSB + expressionLSB / 128;
+        const defaultGain = volume * expression;
+        const defaultPan = panMSB + panLSB / 128;
         const keyBasedVolume = this.getKeyBasedValue(channel, keyNumber, 7);
-        const volume = (0 <= keyBasedVolume)
-            ? defaultVolume * keyBasedVolume / 64
-            : defaultVolume;
+        const gain = (0 <= keyBasedVolume)
+            ? defaultGain * keyBasedVolume / 64
+            : defaultGain;
         const keyBasedPan = this.getKeyBasedValue(channel, keyNumber, 10);
         const pan = (0 <= keyBasedPan) ? keyBasedPan / 127 : defaultPan;
         const { gainLeft, gainRight } = this.panToGain(pan);
         gainL.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainLeft, scheduleTime);
+            .setValueAtTime(gain * gainLeft, scheduleTime);
         gainR.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainRight, scheduleTime);
+            .setValueAtTime(gain * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
             this.processScheduledNotes(channel, (note) => {
@@ -2171,7 +2285,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.portamento = value / 127;
         this.updatePortamento(channel, scheduleTime);
     }
@@ -2179,7 +2294,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.sostenutoPedal = value / 127;
         if (64 <= value) {
             const sostenutoNotes = [];
@@ -2200,7 +2316,8 @@ export class Midy {
         if (channel.isDrum)
             return;
         const state = channel.state;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         state.softPedal = softPedal / 127;
         this.processScheduledNotes(channel, (note) => {
             if (this.isPortamento(channel, note)) {
@@ -2217,11 +2334,12 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const state = channel.state;
         state.filterResonance = ccValue / 127;
-        const filterResonance = this.getRelativeKeyBasedValue(channel, note, 71);
         this.processScheduledNotes(channel, (note) => {
+            const filterResonance = this.getRelativeKeyBasedValue(channel, note, 71);
             const Q = note.voiceParams.initialFilterQ / 5 * filterResonance;
             note.filterNode.Q.setValueAtTime(Q, scheduleTime);
         });
@@ -2238,14 +2356,16 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.releaseTime = releaseTime / 127;
     }
     setAttackTime(channelNumber, attackTime, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.attackTime = attackTime / 127;
         this.processScheduledNotes(channel, (note) => {
             if (scheduleTime < note.startTime) {
@@ -2258,7 +2378,8 @@ export class Midy {
         if (channel.isDrum)
             return;
         const state = channel.state;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         state.brightness = brightness / 127;
         this.processScheduledNotes(channel, (note) => {
             if (this.isPortamento(channel, note)) {
@@ -2273,7 +2394,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.decayTime = dacayTime / 127;
         this.processScheduledNotes(channel, (note) => {
             this.setVolumeEnvelope(channel, note, scheduleTime);
@@ -2283,7 +2405,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.vibratoRate = vibratoRate / 127;
         if (channel.vibratoDepth <= 0)
             return;
@@ -2295,7 +2418,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const prev = channel.state.vibratoDepth;
         channel.state.vibratoDepth = vibratoDepth / 127;
         if (0 < prev) {
@@ -2313,7 +2437,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.vibratoDelay = vibratoDelay / 127;
         if (0 < channel.state.vibratoDepth) {
             this.processScheduledNotes(channel, (note) => {
@@ -2321,8 +2446,16 @@ export class Midy {
             });
         }
     }
+    setPortamentoNoteNumber(channelNumber, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
+        const channel = this.channels[channelNumber];
+        channel.portamentoControl = true;
+        channel.state.portamentoNoteNumber = value / 127;
+    }
     setReverbSendLevel(channelNumber, reverbSendLevel, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
         state.reverbSendLevel = reverbSendLevel / 127;
@@ -2331,7 +2464,8 @@ export class Midy {
         });
     }
     setChorusSendLevel(channelNumber, chorusSendLevel, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
         state.chorusSendLevel = chorusSendLevel / 127;
@@ -2391,12 +2525,14 @@ export class Midy {
     }
     // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
     dataIncrement(channelNumber, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.handleRPN(channelNumber, 1, scheduleTime);
     }
     // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
     dataDecrement(channelNumber, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.handleRPN(channelNumber, -1, scheduleTime);
     }
     setRPNMSB(channelNumber, value) {
@@ -2419,7 +2555,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
         const next = value / 12800;
@@ -2439,7 +2576,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const prev = channel.fineTuning;
         const next = value;
         channel.fineTuning = next;
@@ -2456,7 +2594,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const prev = channel.coarseTuning;
         const next = value;
         channel.coarseTuning = next;
@@ -2473,12 +2612,18 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.modulationDepthRange = value;
         this.updateModulation(channel, scheduleTime);
     }
-    allSoundOff(channelNumber, _value, scheduleTime) {
+    setRPGMakerLoop(_channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
+        this.loopStart = scheduleTime + this.resumeTime - this.startTime;
+    }
+    allSoundOff(channelNumber, _value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
     resetChannelStates(channelNumber) {
@@ -2508,8 +2653,10 @@ export class Midy {
             "polyphonicKeyPressure",
             "channelPressure",
             "pitchWheel",
-            "expression",
-            "modulationDepth",
+            "expressionMSB",
+            "expressionLSB",
+            "modulationDepthMSB",
+            "modulationDepthLSB",
             "sustainPedal",
             "portamento",
             "sostenutoPedal",
@@ -2538,7 +2685,8 @@ export class Midy {
         }
     }
     allNotesOff(channelNumber, _value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, false, scheduleTime);
     }
     omniOff(channelNumber, value, scheduleTime) {
@@ -2590,7 +2738,8 @@ export class Midy {
         }
     }
     GM1SystemOn(scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.mode = "GM1";
         for (let i = 0; i < this.channels.length; i++) {
             this.allSoundOff(i, 0, scheduleTime);
@@ -2603,7 +2752,8 @@ export class Midy {
         this.channels[9].isDrum = true;
     }
     GM2SystemOn(scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.mode = "GM2";
         for (let i = 0; i < this.channels.length; i++) {
             this.allSoundOff(i, 0, scheduleTime);
@@ -2671,7 +2821,8 @@ export class Midy {
         this.setMasterVolume(volume, scheduleTime);
     }
     setMasterVolume(value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.masterVolume.gain
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(value * value, scheduleTime);
@@ -3218,5 +3369,6 @@ Object.defineProperty(Midy, "channelSettings", {
         modulationDepthRange: 50, // cent
         fineTuning: 0, // cent
         coarseTuning: 0, // cent
+        portamentoControl: false,
     }
 });