@marmooo/midy 0.3.6 → 0.3.7

package/script/midy-GM2.js

@@ -228,13 +228,13 @@ class MidyGM2 {
             configurable: true,
             writable: true,
             value: 0
-        }); // cb
+        }); // cent
         Object.defineProperty(this, "masterCoarseTuning", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: 0
-        }); // cb
+        }); // cent
         Object.defineProperty(this, "reverb", {
             enumerable: true,
             configurable: true,
@@ -359,6 +359,12 @@ class MidyGM2 {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "playPromise", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "timeline", {
             enumerable: true,
             configurable: true,
@@ -527,7 +533,7 @@ class MidyGM2 {
         channel.controlTable.fill(-1);
         channel.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
         channel.channelPressureTable.fill(-1);
-        channel.keyBasedInstrumentControlTable.fill(-1);
+        channel.keyBasedTable.fill(-1);
     }
     createChannels(audioContext) {
         const channels = Array.from({ length: this.numChannels }, () => {
@@ -543,7 +549,7 @@ class MidyGM2 {
                 controlTable: this.initControlTable(),
                 scaleOctaveTuningTable: new Int8Array(12), // [-64, 63] cent
                 channelPressureTable: new Int8Array(6).fill(-1),
-                keyBasedInstrumentControlTable: new Int8Array(128 * 128).fill(-1),
+                keyBasedTable: new Int8Array(128 * 128).fill(-1),
                 keyBasedGainLs: new Array(128),
                 keyBasedGainRs: new Array(128),
             };
@@ -618,72 +624,80 @@ class MidyGM2 {
         }
         return 0;
     }
-    playNotes() {
-        return new Promise((resolve) => {
-            this.isPlaying = true;
-            this.isPaused = false;
-            this.startTime = this.audioContext.currentTime;
-            let queueIndex = this.getQueueIndex(this.resumeTime);
-            let resumeTime = this.resumeTime - this.startTime;
+    resetAllStates() {
+        this.exclusiveClassNotes.fill(undefined);
+        this.drumExclusiveClassNotes.fill(undefined);
+        this.voiceCache.clear();
+        for (let i = 0; i < this.channels.length; i++) {
+            this.channels[i].scheduledNotes = [];
+            this.resetChannelStates(i);
+        }
+    }
+    updateStates(queueIndex, nextQueueIndex) {
+        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);
+                    break;
+                case "programChange":
+                    this.setProgramChange(event.channel, event.programNumber, 0);
+                    break;
+                case "pitchBend":
+                    this.setPitchBend(event.channel, event.value + 8192, 0);
+                    break;
+                case "sysEx":
+                    this.handleSysEx(event.data, 0);
+            }
+        }
+    }
+    async playNotes() {
+        if (this.audioContext.state === "suspended") {
+            await this.audioContext.resume();
+        }
+        this.isPlaying = true;
+        this.isPaused = false;
+        this.startTime = this.audioContext.currentTime;
+        let queueIndex = this.getQueueIndex(this.resumeTime);
+        let resumeTime = this.resumeTime - this.startTime;
+        let finished = false;
+        this.notePromises = [];
+        while (queueIndex < this.timeline.length) {
+            const now = this.audioContext.currentTime;
+            const t = now + resumeTime;
+            queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
+            if (this.isPausing) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                this.notePromises = [];
+                break;
+            }
+            else if (this.isStopping) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                finished = true;
+                break;
+            }
+            else if (this.isSeeking) {
+                await this.stopNotes(0, true, now);
+                this.startTime = this.audioContext.currentTime;
+                const nextQueueIndex = this.getQueueIndex(this.resumeTime);
+                this.updateStates(queueIndex, nextQueueIndex);
+                queueIndex = nextQueueIndex;
+                resumeTime = this.resumeTime - this.startTime;
+                this.isSeeking = false;
+                continue;
+            }
+            const waitTime = now + this.noteCheckInterval;
+            await this.scheduleTask(() => { }, waitTime);
+        }
+        if (finished) {
             this.notePromises = [];
-            const schedulePlayback = async () => {
-                if (queueIndex >= this.timeline.length) {
-                    await Promise.all(this.notePromises);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.drumExclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.channels[i].scheduledNotes = [];
-                        this.resetAllStates(i);
-                    }
-                    resolve();
-                    return;
-                }
-                const now = this.audioContext.currentTime;
-                const t = now + resumeTime;
-                queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
-                if (this.isPausing) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.isPausing = false;
-                    this.isPaused = true;
-                    resolve();
-                    return;
-                }
-                else if (this.isStopping) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.drumExclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.channels[i].scheduledNotes = [];
-                        this.resetAllStates(i);
-                    }
-                    this.isStopping = false;
-                    this.isPaused = false;
-                    resolve();
-                    return;
-                }
-                else if (this.isSeeking) {
-                    this.stopNotes(0, true, now);
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.drumExclusiveClassNotes.fill(undefined);
-                    this.startTime = this.audioContext.currentTime;
-                    queueIndex = this.getQueueIndex(this.resumeTime);
-                    resumeTime = this.resumeTime - this.startTime;
-                    this.isSeeking = false;
-                    await schedulePlayback();
-                }
-                else {
-                    const waitTime = now + this.noteCheckInterval;
-                    await this.scheduleTask(() => { }, waitTime);
-                    await schedulePlayback();
-                }
-            };
-            schedulePlayback();
-        });
+            this.resetAllStates();
+        }
+        this.isPlaying = false;
     }
     ticksToSecond(ticks, secondsPerBeat) {
         return ticks * secondsPerBeat / this.ticksPerBeat;
@@ -820,26 +834,32 @@ class MidyGM2 {
         this.resumeTime = 0;
         if (this.voiceCounter.size === 0)
             this.cacheVoiceIds();
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
     }
-    stop() {
+    async stop() {
         if (!this.isPlaying)
             return;
         this.isStopping = true;
+        await this.playPromise;
+        this.isStopping = false;
     }
-    pause() {
+    async pause() {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
         this.resumeTime += now - this.startTime - this.startDelay;
         this.isPausing = true;
+        await this.playPromise;
+        this.isPausing = false;
+        this.isPaused = true;
     }
     async resume() {
         if (!this.isPaused)
             return;
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
+        this.isPaused = false;
     }
     seekTo(second) {
         this.resumeTime = second;
@@ -1274,10 +1294,12 @@ class MidyGM2 {
     startVibrato(channel, note, scheduleTime) {
         const { voiceParams } = note;
         const state = channel.state;
+        const vibratoRate = state.vibratoRate * 2;
+        const vibratoDelay = state.vibratoDelay * 2;
         note.vibratoLFO = new OscillatorNode(this.audioContext, {
-            frequency: this.centToHz(voiceParams.freqVibLFO) * state.vibratoRate * 2,
+            frequency: this.centToHz(voiceParams.freqVibLFO) * vibratoRate,
         });
-        note.vibratoLFO.start(note.startTime + voiceParams.delayVibLFO * state.vibratoDelay * 2);
+        note.vibratoLFO.start(note.startTime + voiceParams.delayVibLFO * vibratoDelay);
         note.vibratoDepth = new GainNode(this.audioContext);
         this.setVibLfoToPitch(channel, note, scheduleTime);
         note.vibratoLFO.connect(note.vibratoDepth);
@@ -1589,6 +1611,7 @@ class MidyGM2 {
                     break;
             }
         }
+        channel.keyBasedTable.fill(-1);
     }
     setChannelPressure(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -1604,7 +1627,7 @@ class MidyGM2 {
         }
         const table = channel.channelPressureTable;
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            this.setEffects(channel, note, table);
+            this.setEffects(channel, note, table, scheduleTime);
         });
         this.applyVoiceParams(channel, 13);
     }
@@ -1630,23 +1653,28 @@ class MidyGM2 {
             const modLfoToPitch = note.voiceParams.modLfoToPitch +
                 this.getLFOPitchDepth(channel, note);
             const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
-            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            const depth = baseDepth * Math.sign(modLfoToPitch);
             note.modulationDepth.gain
                 .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(modulationDepth, scheduleTime);
+                .setValueAtTime(depth, scheduleTime);
         }
         else {
             this.startModulation(channel, note, scheduleTime);
         }
     }
     setVibLfoToPitch(channel, note, scheduleTime) {
-        const vibLfoToPitch = note.voiceParams.vibLfoToPitch;
-        const vibratoDepth = Math.abs(vibLfoToPitch) * channel.state.vibratoDepth *
-            2;
-        const vibratoDepthSign = 0 < vibLfoToPitch;
-        note.vibratoDepth.gain
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(vibratoDepth * vibratoDepthSign, scheduleTime);
+        if (note.vibratoDepth) {
+            const vibratoDepth = channel.state.vibratoDepth * 2;
+            const vibLfoToPitch = note.voiceParams.vibLfoToPitch;
+            const baseDepth = Math.abs(vibLfoToPitch) * vibratoDepth;
+            const depth = baseDepth * Math.sign(vibLfoToPitch);
+            note.vibratoDepth.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(depth, scheduleTime);
+        }
+        else {
+            this.startVibrato(channel, note, scheduleTime);
+        }
     }
     setModLfoToFilterFc(channel, note, scheduleTime) {
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc +
@@ -1724,13 +1752,12 @@ class MidyGM2 {
             }
         }
     }
-    setDelayModLFO(note, scheduleTime) {
-        const startTime = note.startTime;
-        if (startTime < scheduleTime)
-            return;
-        note.modulationLFO.stop(scheduleTime);
-        note.modulationLFO.start(startTime + note.voiceParams.delayModLFO);
-        note.modulationLFO.connect(note.filterDepth);
+    setDelayModLFO(note) {
+        const startTime = note.startTime + note.voiceParams.delayModLFO;
+        try {
+            note.modulationLFO.start(startTime);
+        }
+        catch { /* empty */ }
     }
     setFreqModLFO(note, scheduleTime) {
         const freqModLFO = note.voiceParams.freqModLFO;
@@ -1739,54 +1766,65 @@ class MidyGM2 {
             .setValueAtTime(freqModLFO, scheduleTime);
     }
     setFreqVibLFO(channel, note, scheduleTime) {
+        const vibratoRate = channel.state.vibratoRate * 2;
         const freqVibLFO = note.voiceParams.freqVibLFO;
         note.vibratoLFO.frequency
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(freqVibLFO * channel.state.vibratoRate * 2, scheduleTime);
+            .setValueAtTime(freqVibLFO * vibratoRate, scheduleTime);
+    }
+    setDelayVibLFO(channel, note) {
+        const vibratoDelay = channel.state.vibratoDelay * 2;
+        const value = note.voiceParams.delayVibLFO;
+        const startTime = note.startTime + value * vibratoDelay;
+        try {
+            note.vibratoLFO.start(startTime);
+        }
+        catch { /* empty */ }
     }
     createVoiceParamsHandlers() {
         return {
-            modLfoToPitch: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToPitch: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
-            vibLfoToPitch: (channel, note, _prevValue, scheduleTime) => {
+            vibLfoToPitch: (channel, note, scheduleTime) => {
                 if (0 < channel.state.vibratoDepth) {
                     this.setVibLfoToPitch(channel, note, scheduleTime);
                 }
             },
-            modLfoToFilterFc: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToFilterFc: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToFilterFc(channel, note, scheduleTime);
                 }
             },
-            modLfoToVolume: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToVolume: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToVolume(channel, note, scheduleTime);
                 }
             },
-            chorusEffectsSend: (channel, note, prevValue, scheduleTime) => {
-                this.setChorusEffectsSend(channel, note, prevValue, scheduleTime);
+            chorusEffectsSend: (channel, note, scheduleTime) => {
+                this.setChorusSend(channel, note, scheduleTime);
+            },
+            reverbEffectsSend: (channel, note, scheduleTime) => {
+                this.setReverbSend(channel, note, scheduleTime);
+            },
+            delayModLFO: (_channel, note, _scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setDelayModLFO(note);
+                }
             },
-            reverbEffectsSend: (channel, note, prevValue, scheduleTime) => {
-                this.setReverbEffectsSend(channel, note, prevValue, scheduleTime);
+            freqModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setFreqModLFO(note, scheduleTime);
+                }
             },
-            delayModLFO: (_channel, note, _prevValue, scheduleTime) => this.setDelayModLFO(note, scheduleTime),
-            freqModLFO: (_channel, note, _prevValue, scheduleTime) => this.setFreqModLFO(note, scheduleTime),
-            delayVibLFO: (channel, note, prevValue, scheduleTime) => {
+            delayVibLFO: (channel, note, _scheduleTime) => {
                 if (0 < channel.state.vibratoDepth) {
-                    const vibratoDelay = channel.state.vibratoDelay * 2;
-                    const prevStartTime = note.startTime + prevValue * vibratoDelay;
-                    if (scheduleTime < prevStartTime)
-                        return;
-                    const value = note.voiceParams.delayVibLFO;
-                    const startTime = note.startTime + value * vibratoDelay;
-                    note.vibratoLFO.stop(scheduleTime);
-                    note.vibratoLFO.start(startTime);
+                    setDelayVibLFO(channel, note);
                 }
             },
-            freqVibLFO: (channel, note, _prevValue, scheduleTime) => {
+            freqVibLFO: (channel, note, scheduleTime) => {
                 if (0 < channel.state.vibratoDepth) {
                     this.setFreqVibLFO(channel, note, scheduleTime);
                 }
@@ -1814,7 +1852,7 @@ class MidyGM2 {
                     continue;
                 note.voiceParams[key] = value;
                 if (key in this.voiceParamsHandlers) {
-                    this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
+                    this.voiceParamsHandlers[key](channel, note, scheduleTime);
                 }
                 else {
                     if (volumeEnvelopeKeySet.has(key))
@@ -1983,13 +2021,13 @@ class MidyGM2 {
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
     updateKeyBasedVolume(channel, keyNumber, scheduleTime) {
-        const state = channel.state;
-        const defaultVolume = state.volume * state.expression;
-        const defaultPan = state.pan;
         const gainL = channel.keyBasedGainLs[keyNumber];
-        const gainR = channel.keyBasedGainRs[keyNumber];
         if (!gainL)
             return;
+        const gainR = channel.keyBasedGainRs[keyNumber];
+        const state = channel.state;
+        const defaultVolume = state.volume * state.expression;
+        const defaultPan = state.pan;
         const keyBasedVolume = this.getKeyBasedValue(channel, keyNumber, 7);
         const volume = (0 <= keyBasedVolume)
             ? defaultVolume * keyBasedVolume / 64
@@ -2141,8 +2179,8 @@ class MidyGM2 {
     }
     handlePitchBendRangeRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
-        this.limitData(channel, 0, 127, 0, 99);
-        const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
+        this.limitData(channel, 0, 127, 0, 127);
+        const pitchBendRange = (channel.dataMSB + channel.dataLSB / 128) * 100;
         this.setPitchBendRange(channelNumber, pitchBendRange, scheduleTime);
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
@@ -2152,7 +2190,7 @@ class MidyGM2 {
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
-        const next = value / 128;
+        const next = value / 12800;
         state.pitchWheelSensitivity = next;
         channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
         this.updateChannelDetune(channel, scheduleTime);
@@ -2161,7 +2199,8 @@ class MidyGM2 {
     handleFineTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
-        const fineTuning = channel.dataMSB * 128 + channel.dataLSB;
+        const value = channel.dataMSB * 128 + channel.dataLSB;
+        const fineTuning = (value - 8192) / 8192 * 100;
         this.setFineTuning(channelNumber, fineTuning, scheduleTime);
     }
     setFineTuning(channelNumber, value, scheduleTime) {
@@ -2170,7 +2209,7 @@ class MidyGM2 {
             return;
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.fineTuning;
-        const next = (value - 8192) / 8.192; // cent
+        const next = value;
         channel.fineTuning = next;
         channel.detune += next - prev;
         this.updateChannelDetune(channel, scheduleTime);
@@ -2178,7 +2217,7 @@ class MidyGM2 {
     handleCoarseTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
-        const coarseTuning = channel.dataMSB;
+        const coarseTuning = (channel.dataMSB - 64) * 100;
         this.setCoarseTuning(channelNumber, coarseTuning, scheduleTime);
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
@@ -2187,7 +2226,7 @@ class MidyGM2 {
             return;
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.coarseTuning;
-        const next = (value - 64) * 100; // cent
+        const next = value;
         channel.coarseTuning = next;
         channel.detune += next - prev;
         this.updateChannelDetune(channel, scheduleTime);
@@ -2195,22 +2234,22 @@ class MidyGM2 {
     handleModulationDepthRangeRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
-        const modulationDepthRange = (dataMSB + dataLSB / 128) * 100;
-        this.setModulationDepthRange(channelNumber, modulationDepthRange, scheduleTime);
+        const value = (channel.dataMSB + channel.dataLSB / 128) * 100;
+        this.setModulationDepthRange(channelNumber, value, scheduleTime);
     }
-    setModulationDepthRange(channelNumber, modulationDepthRange, scheduleTime) {
+    setModulationDepthRange(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
         scheduleTime ??= this.audioContext.currentTime;
-        channel.modulationDepthRange = modulationDepthRange;
+        channel.modulationDepthRange = value;
         this.updateModulation(channel, scheduleTime);
     }
     allSoundOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
-    resetAllStates(channelNumber) {
+    resetChannelStates(channelNumber) {
         const scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
@@ -2228,8 +2267,8 @@ class MidyGM2 {
         }
         this.resetChannelTable(channel);
         this.mode = "GM2";
-        this.masterFineTuning = 0; // cb
-        this.masterCoarseTuning = 0; // cb
+        this.masterFineTuning = 0; // cent
+        this.masterCoarseTuning = 0; // cent
     }
     // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp15.pdf
     resetAllControllers(channelNumber, _value, scheduleTime) {
@@ -2398,12 +2437,13 @@ class MidyGM2 {
         }
     }
     handleMasterFineTuningSysEx(data, scheduleTime) {
-        const fineTuning = data[5] * 128 + data[4];
+        const value = (data[5] * 128 + data[4]) / 16383;
+        const fineTuning = (value - 8192) / 8192 * 100;
         this.setMasterFineTuning(fineTuning, scheduleTime);
     }
     setMasterFineTuning(value, scheduleTime) {
         const prev = this.masterFineTuning;
-        const next = (value - 8192) / 8.192; // cent
+        const next = value;
         this.masterFineTuning = next;
         const detuneChange = next - prev;
         for (let i = 0; i < this.channels.length; i++) {
@@ -2415,12 +2455,12 @@ class MidyGM2 {
         }
     }
     handleMasterCoarseTuningSysEx(data, scheduleTime) {
-        const coarseTuning = data[4];
+        const coarseTuning = (data[4] - 64) * 100;
         this.setMasterCoarseTuning(coarseTuning, scheduleTime);
     }
     setMasterCoarseTuning(value, scheduleTime) {
         const prev = this.masterCoarseTuning;
-        const next = (value - 64) * 100; // cent
+        const next = value;
         this.masterCoarseTuning = next;
         const detuneChange = next - prev;
         for (let i = 0; i < this.channels.length; i++) {
@@ -2754,7 +2794,7 @@ class MidyGM2 {
     }
     getKeyBasedValue(channel, keyNumber, controllerType) {
         const index = keyNumber * 128 + controllerType;
-        const controlValue = channel.keyBasedInstrumentControlTable[index];
+        const controlValue = channel.keyBasedTable[index];
         return controlValue;
     }
     handleKeyBasedInstrumentControlSysEx(data, scheduleTime) {
@@ -2763,7 +2803,7 @@ class MidyGM2 {
         if (!channel.isDrum)
             return;
         const keyNumber = data[5];
-        const table = channel.keyBasedInstrumentControlTable;
+        const table = channel.keyBasedTable;
         for (let i = 6; i < data.length; i += 2) {
             const controllerType = data[i];
             const value = data[i + 1];
@@ -2774,8 +2814,20 @@ class MidyGM2 {
                 case 10:
                     this.updateKeyBasedVolume(channel, keyNumber, scheduleTime);
                     break;
-                default: // TODO
-                    this.setControlChange(channelNumber, controllerType, value, scheduleTime);
+                case 91:
+                    this.processScheduledNotes(channel, (note) => {
+                        if (note.noteNumber === keyNumber) {
+                            this.setReverbSend(channel, note, scheduleTime);
+                        }
+                    });
+                    break;
+                case 93:
+                    this.processScheduledNotes(channel, (note) => {
+                        if (note.noteNumber === keyNumber) {
+                            this.setChorusSend(channel, note, scheduleTime);
+                        }
+                    });
+                    break;
             }
         }
     }
@@ -2827,7 +2879,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         rpnLSB: 127,
         mono: false, // CC#124, CC#125
         modulationDepthRange: 50, // cent
-        fineTuning: 0, // cb
-        coarseTuning: 0, // cb
+        fineTuning: 0, // cent
+        coarseTuning: 0, // cent
     }
 });