@marmooo/midy 0.1.1 → 0.1.3

package/script/midy-GM2.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidyGM2 = void 0;
 const _esm_js_1 = require("./deps/cdn.jsdelivr.net/npm/midi-file@1.2.4/+esm.js");
-const _esm_js_2 = require("./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.2/+esm.js");
+const _esm_js_2 = require("./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.4/+esm.js");
 class Note {
     constructor(noteNumber, velocity, startTime, instrumentKey) {
         Object.defineProperty(this, "bufferSource", {
@@ -11,37 +11,43 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "gainNode", {
+        Object.defineProperty(this, "filterNode", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "filterNode", {
+        Object.defineProperty(this, "volumeNode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "volumeDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modLFO", {
+        Object.defineProperty(this, "modulationLFO", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modLFOGain", {
+        Object.defineProperty(this, "modulationDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "vibLFO", {
+        Object.defineProperty(this, "vibratoLFO", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "vibLFOGain", {
+        Object.defineProperty(this, "vibratoDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -85,7 +91,7 @@ class MidyGM2 {
             writable: true,
             value: {
                 time: this.getReverbTime(64),
-                feedback: 0.25,
+                feedback: 0.8,
             }
         });
         Object.defineProperty(this, "chorus", {
@@ -227,8 +233,12 @@ class MidyGM2 {
         this.audioContext = audioContext;
         this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
-        this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
+        this.reverbEffect = this.options.reverbAlgorithm(audioContext);
+        this.chorusEffect = this.createChorusEffect(audioContext);
+        this.chorusEffect.output.connect(this.masterGain);
+        this.reverbEffect.output.connect(this.masterGain);
+        this.masterGain.connect(audioContext.destination);
         this.GM2SystemOn();
     }
     initSoundFontTable() {
@@ -272,14 +282,11 @@ class MidyGM2 {
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
         gainL.connect(merger, 0, 0);
         gainR.connect(merger, 0, 1);
-        const reverbEffect = this.options.reverbAlgorithm(audioContext);
-        const chorusEffect = this.createChorusEffect(audioContext);
+        merger.connect(this.masterGain);
         return {
             gainL,
             gainR,
             merger,
-            reverbEffect,
-            chorusEffect,
         };
     }
     createChannels(audioContext) {
@@ -406,7 +413,7 @@ class MidyGM2 {
                 const t = this.audioContext.currentTime + offset;
                 queueIndex = await this.scheduleTimelineEvents(t, offset, queueIndex);
                 if (this.isPausing) {
-                    await this.stopNotes();
+                    await this.stopNotes(0, true);
                     this.notePromises = [];
                     resolve();
                     this.isPausing = false;
@@ -414,7 +421,7 @@ class MidyGM2 {
                     return;
                 }
                 else if (this.isStopping) {
-                    await this.stopNotes();
+                    await this.stopNotes(0, true);
                     this.notePromises = [];
                     resolve();
                     this.isStopping = false;
@@ -422,7 +429,7 @@ class MidyGM2 {
                     return;
                 }
                 else if (this.isSeeking) {
-                    this.stopNotes();
+                    this.stopNotes(0, true);
                     this.startTime = this.audioContext.currentTime;
                     queueIndex = this.getQueueIndex(this.resumeTime);
                     offset = this.resumeTime - this.startTime;
@@ -537,21 +544,24 @@ class MidyGM2 {
         }
         return { instruments, timeline };
     }
-    stopNotes() {
+    async stopChannelNotes(channelNumber, velocity, stopPedal) {
         const now = this.audioContext.currentTime;
-        const velocity = 0;
-        const stopPedal = true;
-        this.channels.forEach((channel, channelNumber) => {
-            channel.scheduledNotes.forEach((scheduledNotes) => {
-                scheduledNotes.forEach((scheduledNote) => {
-                    if (scheduledNote) {
-                        const promise = this.scheduleNoteRelease(channelNumber, scheduledNote.noteNumber, velocity, now, stopPedal);
-                        this.notePromises.push(promise);
-                    }
-                });
+        const channel = this.channels[channelNumber];
+        channel.scheduledNotes.forEach((noteList) => {
+            noteList.forEach((note) => {
+                if (note) {
+                    const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
+                    this.notePromises.push(promise);
+                }
             });
-            channel.scheduledNotes.clear();
         });
+        channel.scheduledNotes.clear();
+        await Promise.all(this.notePromises);
+    }
+    stopNotes(velocity, stopPedal) {
+        for (let i = 0; i < this.channels.length; i++) {
+            this.stopChannelNotes(i, velocity, stopPedal);
+        }
         return Promise.all(this.notePromises);
     }
     async start() {
@@ -689,7 +699,7 @@ class MidyGM2 {
     }
     // https://hajim.rochester.edu/ece/sites/zduan/teaching/ece472/reading/Schroeder_1962.pdf
     //   M.R.Schroeder, "Natural Sounding Artificial Reverberation", J.Audio Eng. Soc., vol.10, p.219, 1962
-    createSchroederReverb(audioContext, combDelays, combFeedbacks, allpassDelays, allpassFeedbacks) {
+    createSchroederReverb(audioContext, combFeedbacks, combDelays, allpassFeedbacks, allpassDelays) {
         const input = new GainNode(audioContext);
         const output = new GainNode(audioContext);
         const mergerGain = new GainNode(audioContext);
@@ -748,21 +758,6 @@ class MidyGM2 {
             feedbackGains,
         };
     }
-    connectEffects(channel, gainNode) {
-        gainNode.connect(channel.merger);
-        channel.merger.connect(this.masterGain);
-        if (0 < channel.reverbSendLevel) {
-            channel.merger.connect(channel.reverbEffect.input);
-            channel.reverbEffect.output.connect(this.masterGain);
-        }
-        if (0 < channel.chorusSendLevel) {
-            channel.merger.connect(channel.chorusEffect.input);
-            channel.reverbEffect.output.connect(this.masterGain);
-        }
-        if (0 < this.chorus.sendToReverb) {
-            channel.chorusEffect.sendGain.connect(channel.reverbEffect.input);
-        }
-    }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
     }
@@ -779,42 +774,56 @@ class MidyGM2 {
         return instrumentKey.playbackRate(noteNumber) *
             Math.pow(2, semitoneOffset / 12);
     }
-    setVolumeEnvelope(channel, note) {
-        const { instrumentKey, startTime, velocity } = note;
-        note.gainNode = new GainNode(this.audioContext, { gain: 0 });
-        let volume = (velocity / 127) * channel.volume * channel.expression;
-        if (volume === 0)
-            volume = 1e-6; // exponentialRampToValueAtTime() requires a non-zero value
-        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation) *
-            volume;
+    setVolumeEnvelope(note) {
+        const { instrumentKey, startTime } = note;
+        note.volumeNode = new GainNode(this.audioContext, { gain: 0 });
+        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
         const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
         const volDelay = startTime + instrumentKey.volDelay;
         const volAttack = volDelay + instrumentKey.volAttack;
         const volHold = volAttack + instrumentKey.volHold;
         const volDecay = volHold + instrumentKey.volDecay;
-        note.gainNode.gain
+        note.volumeNode.gain
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
             .linearRampToValueAtTime(sustainVolume, volDecay);
     }
-    setFilterEnvelope(channel, note) {
-        const { instrumentKey, startTime, noteNumber } = note;
+    setPitch(note, semitoneOffset) {
+        const { instrumentKey, noteNumber, startTime } = note;
+        const modEnvToPitch = instrumentKey.modEnvToPitch / 100;
+        note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
+        if (modEnvToPitch === 0)
+            return;
+        const basePitch = note.bufferSource.playbackRate.value;
+        const peekPitch = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset + modEnvToPitch);
+        const modDelay = startTime + instrumentKey.modDelay;
+        const modAttack = modDelay + instrumentKey.modAttack;
+        const modHold = modAttack + instrumentKey.modHold;
+        const modDecay = modHold + instrumentKey.modDecay;
+        note.bufferSource.playbackRate.value
+            .setValueAtTime(basePitch, modDelay)
+            .exponentialRampToValueAtTime(peekPitch, modAttack)
+            .setValueAtTime(peekPitch, modHold)
+            .linearRampToValueAtTime(basePitch, modDecay);
+    }
+    setFilterNode(channel, note) {
+        const { instrumentKey, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
         const maxFreq = this.audioContext.sampleRate / 2;
         const baseFreq = this.centToHz(instrumentKey.initialFilterFc) *
             softPedalFactor;
         const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
-        const sustainFreq = (baseFreq +
-            (peekFreq - baseFreq) * (1 - instrumentKey.modSustain)) * softPedalFactor;
+        const sustainFreq = baseFreq +
+            (peekFreq - baseFreq) * (1 - instrumentKey.modSustain);
+        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
+        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
+        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
         const modDelay = startTime + instrumentKey.modDelay;
         const modAttack = modDelay + instrumentKey.modAttack;
         const modHold = modAttack + instrumentKey.modHold;
         const modDecay = modHold + instrumentKey.modDecay;
-        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
-        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
             Q: instrumentKey.initialFilterQ / 10, // dB
@@ -825,39 +834,72 @@ class MidyGM2 {
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
             .linearRampToValueAtTime(adjustedSustainFreq, modDecay);
-        note.bufferSource.detune.setValueAtTime(note.bufferSource.detune.value + instrumentKey.modEnvToPitch, modDelay);
     }
-    startModulation(channel, note, time) {
+    startModulation(channel, note, startTime) {
         const { instrumentKey } = note;
-        note.modLFOGain = new GainNode(this.audioContext, {
-            gain: this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation),
-        });
-        note.modLFO = new OscillatorNode(this.audioContext, {
+        const { modLfoToPitch, modLfoToVolume } = instrumentKey;
+        note.modulationLFO = new OscillatorNode(this.audioContext, {
             frequency: this.centToHz(instrumentKey.freqModLFO),
         });
-        note.modLFO.start(time);
-        note.filterNode.frequency.setValueAtTime(note.filterNode.frequency.value + instrumentKey.modLfoToFilterFc, time);
-        note.bufferSource.detune.setValueAtTime(note.bufferSource.detune.value + instrumentKey.modLfoToPitch, time);
-        note.modLFO.connect(note.modLFOGain);
-        note.modLFOGain.connect(note.bufferSource.detune);
+        note.filterDepth = new GainNode(this.audioContext, {
+            gain: instrumentKey.modLfoToFilterFc,
+        });
+        const modulationDepth = Math.abs(modLfoToPitch) + channel.modulationDepth;
+        const modulationDepthSign = (0 < modLfoToPitch) ? 1 : -1;
+        note.modulationDepth = new GainNode(this.audioContext, {
+            gain: modulationDepth * modulationDepthSign,
+        });
+        const volumeDepth = this.cbToRatio(Math.abs(modLfoToVolume)) - 1;
+        const volumeDepthSign = (0 < modLfoToVolume) ? 1 : -1;
+        note.volumeDepth = new GainNode(this.audioContext, {
+            gain: volumeDepth * volumeDepthSign,
+        });
+        note.modulationLFO.start(startTime + instrumentKey.delayModLFO);
+        note.modulationLFO.connect(note.filterDepth);
+        note.filterDepth.connect(note.filterNode.frequency);
+        note.modulationLFO.connect(note.modulationDepth);
+        note.modulationDepth.connect(note.bufferSource.detune);
+        note.modulationLFO.connect(note.volumeDepth);
+        note.volumeDepth.connect(note.volumeNode.gain);
+    }
+    startVibrato(channel, note, startTime) {
+        const { instrumentKey } = note;
+        const { vibLfoToPitch } = instrumentKey;
+        note.vibratoLFO = new OscillatorNode(this.audioContext, {
+            frequency: this.centToHz(instrumentKey.freqVibLFO) *
+                channel.vibratoRate,
+        });
+        const vibratoDepth = Math.abs(vibLfoToPitch) * channel.vibratoDepth;
+        const vibratoDepthSign = 0 < vibLfoToPitch;
+        note.vibratoDepth = new GainNode(this.audioContext, {
+            gain: vibratoDepth * vibratoDepthSign,
+        });
+        note.vibratoLFO.start(startTime + instrumentKey.delayVibLFO * channel.vibratoDelay);
+        note.vibratoLFO.connect(note.vibratoDepth);
+        note.vibratoDepth.connect(note.bufferSource.detune);
     }
     async createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3) {
         const semitoneOffset = this.calcSemitoneOffset(channel);
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
-        note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-        this.setVolumeEnvelope(channel, note);
-        this.setFilterEnvelope(channel, note);
-        if (channel.modulation > 0) {
-            const delayModLFO = startTime + instrumentKey.delayModLFO;
-            this.startModulation(channel, note, delayModLFO);
+        this.setFilterNode(channel, note);
+        this.setVolumeEnvelope(note);
+        if (0 < channel.vibratoDepth) {
+            this.startVibrato(channel, note, startTime);
+        }
+        if (0 < channel.modulationDepth) {
+            this.setPitch(note, semitoneOffset);
+            this.startModulation(channel, note, startTime);
+        }
+        else {
+            note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
         }
         if (this.mono && channel.currentBufferSource) {
             channel.currentBufferSource.stop(startTime);
             channel.currentBufferSource = note.bufferSource;
         }
         note.bufferSource.connect(note.filterNode);
-        note.filterNode.connect(note.gainNode);
+        note.filterNode.connect(note.volumeNode);
         note.bufferSource.start(startTime, instrumentKey.start / instrumentKey.sampleRate);
         return note;
     }
@@ -882,7 +924,8 @@ class MidyGM2 {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectEffects(channel, note.gainNode);
+        note.volumeNode.connect(channel.gainL);
+        note.volumeNode.connect(channel.gainR);
         if (channel.sostenutoPedal) {
             channel.sostenutoNotes.set(noteNumber, note);
         }
@@ -916,17 +959,14 @@ class MidyGM2 {
             const velocityRate = (velocity + 127) / 127;
             const volEndTime = stopTime +
                 note.instrumentKey.volRelease * velocityRate;
-            note.gainNode.gain
+            note.volumeNode.gain
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, volEndTime);
-            const maxFreq = this.audioContext.sampleRate / 2;
-            const baseFreq = this.centToHz(note.instrumentKey.initialFilterFc);
-            const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-            const modEndTime = stopTime +
+            const modRelease = stopTime +
                 note.instrumentKey.modRelease * velocityRate;
             note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
-                .linearRampToValueAtTime(adjustedBaseFreq, modEndTime);
+                .linearRampToValueAtTime(0, modRelease);
             note.ending = true;
             this.scheduleTask(() => {
                 note.bufferSource.loop = false;
@@ -935,16 +975,18 @@ class MidyGM2 {
                 note.bufferSource.onended = () => {
                     scheduledNotes[i] = null;
                     note.bufferSource.disconnect();
+                    note.volumeNode.disconnect();
                     note.filterNode.disconnect();
-                    note.gainNode.disconnect();
-                    if (note.modLFOGain)
-                        note.modLFOGain.disconnect();
-                    if (note.vibLFOGain)
-                        note.vibLFOGain.disconnect();
-                    if (note.modLFO)
-                        note.modLFO.stop();
-                    if (note.vibLFO)
-                        note.vibLFO.stop();
+                    if (note.volumeDepth)
+                        note.volumeDepth.disconnect();
+                    if (note.modulationDepth)
+                        note.modulationDepth.disconnect();
+                    if (note.modulationLFO)
+                        note.modulationLFO.stop();
+                    if (note.vibratoDepth)
+                        note.vibratoDepth.disconnect();
+                    if (note.vibratoLFO)
+                        note.vibratoLFO.stop();
                     resolve();
                 };
                 note.bufferSource.stop(volEndTime);
@@ -960,10 +1002,10 @@ class MidyGM2 {
         const channel = this.channels[channelNumber];
         const promises = [];
         channel.sustainPedal = false;
-        channel.scheduledNotes.forEach((scheduledNotes) => {
-            scheduledNotes.forEach((scheduledNote) => {
-                if (scheduledNote) {
-                    const { noteNumber } = scheduledNote;
+        channel.scheduledNotes.forEach((noteList) => {
+            noteList.forEach((note) => {
+                if (note) {
+                    const { noteNumber } = note;
                     const promise = this.releaseNote(channelNumber, noteNumber, velocity);
                     promises.push(promise);
                 }
@@ -1017,21 +1059,21 @@ class MidyGM2 {
         const activeNotes = this.getActiveNotes(channel, now);
         if (channel.channelPressure.amplitudeControl !== 1) {
             activeNotes.forEach((activeNote) => {
-                const gain = activeNote.gainNode.gain.value;
-                activeNote.gainNode.gain
+                const gain = activeNote.volumeNode.gain.value;
+                activeNote.volumeNode.gain
                     .cancelScheduledValues(now)
                     .setValueAtTime(gain * pressure, now);
             });
         }
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
-        const pitchBend = msb * 128 + lsb;
+        const pitchBend = msb * 128 + lsb - 8192;
         this.setPitchBend(channelNumber, pitchBend);
     }
     setPitchBend(channelNumber, pitchBend) {
         const channel = this.channels[channelNumber];
         const prevPitchBend = channel.pitchBend;
-        channel.pitchBend = (pitchBend - 8192) / 8192;
+        channel.pitchBend = pitchBend / 8192;
         const detuneChange = (channel.pitchBend - prevPitchBend) *
             channel.pitchBendRange * 100;
         this.updateDetune(channel, detuneChange);
@@ -1041,7 +1083,7 @@ class MidyGM2 {
             case 0:
                 return this.setBankMSB(channelNumber, value);
             case 1:
-                return this.setModulation(channelNumber, value);
+                return this.setModulationDepth(channelNumber, value);
             case 5:
                 return this.setPortamentoTime(channelNumber, value);
             case 6:
@@ -1097,18 +1139,19 @@ class MidyGM2 {
         const now = this.audioContext.currentTime;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
-            if (activeNote.modLFO) {
-                const { gainNode, instrumentKey } = activeNote;
-                gainNode.gain.setValueAtTime(this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation), now);
+            if (activeNote.modulationDepth) {
+                activeNote.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
             }
             else {
+                const semitoneOffset = this.calcSemitoneOffset(channel);
+                this.setPitch(activeNote, semitoneOffset);
                 this.startModulation(channel, activeNote, now);
             }
         });
     }
-    setModulation(channelNumber, modulation) {
+    setModulationDepth(channelNumber, modulation) {
         const channel = this.channels[channelNumber];
-        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        channel.modulationDepth = (modulation / 127) * channel.modulationDepthRange;
         this.updateModulation(channel);
     }
     setPortamentoTime(channelNumber, portamentoTime) {
@@ -1166,20 +1209,30 @@ class MidyGM2 {
         this.channels[channelNumber].portamento = value >= 64;
     }
     setReverbSendLevel(channelNumber, reverbSendLevel) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const reverbEffect = channel.reverbEffect;
-        channel.reverbSendLevel = reverbSendLevel / 127;
-        reverbEffect.output.gain.cancelScheduledValues(now);
-        reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
+        const reverbEffect = this.reverbEffect;
+        if (0 < reverbSendLevel) {
+            const now = this.audioContext.currentTime;
+            channel.reverbSendLevel = reverbSendLevel / 127;
+            reverbEffect.output.gain.cancelScheduledValues(now);
+            reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
+        }
+        else if (channel.reverbSendLevel !== 0) {
+            channel.merger.disconnect(reverbEffect.input);
+        }
     }
     setChorusSendLevel(channelNumber, chorusSendLevel) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const chorusEffect = channel.chorusEffect;
-        channel.chorusSendLevel = chorusSendLevel / 127;
-        chorusEffect.output.gain.cancelScheduledValues(now);
-        chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+        const chorusEffect = this.chorusEffect;
+        if (0 < chorusSendLevel) {
+            const now = this.audioContext.currentTime;
+            channel.chorusSendLevel = chorusSendLevel / 127;
+            chorusEffect.output.gain.cancelScheduledValues(now);
+            chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+        }
+        else if (channel.chorusSendLevel !== 0) {
+            channel.merger.disconnect(chorusEffect.input);
+        }
     }
     setSostenutoPedal(channelNumber, value) {
         const isOn = value >= 64;
@@ -1308,47 +1361,23 @@ class MidyGM2 {
     handleModulationDepthRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
-        const modulationDepthRange = dataMSB + dataLSB / 128;
+        const modulationDepthRange = (dataMSB + dataLSB / 128) * 100;
         this.setModulationDepthRange(channelNumber, modulationDepthRange);
     }
     setModulationDepthRange(channelNumber, modulationDepthRange) {
         const channel = this.channels[channelNumber];
         channel.modulationDepthRange = modulationDepthRange;
-        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        channel.modulationDepth = (modulation / 127) * modulationDepthRange;
         this.updateModulation(channel);
     }
     allSoundOff(channelNumber) {
-        const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const velocity = 0;
-        const stopPedal = true;
-        const promises = [];
-        channel.scheduledNotes.forEach((noteList) => {
-            const activeNote = this.getActiveNote(noteList, now);
-            if (activeNote) {
-                const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
-                promises.push(notePromise);
-            }
-        });
-        return promises;
+        return this.stopChannelNotes(channelNumber, 0, true);
     }
     resetAllControllers(channelNumber) {
         Object.assign(this.channels[channelNumber], this.effectSettings);
     }
     allNotesOff(channelNumber) {
-        const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const velocity = 0;
-        const stopPedal = false;
-        const promises = [];
-        channel.scheduledNotes.forEach((noteList) => {
-            const activeNote = this.getActiveNote(noteList, now);
-            if (activeNote) {
-                const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
-                promises.push(notePromise);
-            }
-        });
-        return promises;
+        return this.stopChannelNotes(channelNumber, 0, false);
     }
     omniOff() {
         this.omni = false;
@@ -1513,11 +1542,9 @@ class MidyGM2 {
     }
     setReverbType(type) {
         this.reverb.time = this.getReverbTimeFromType(type);
-        this.reverb.feedback = (type === 8) ? 0.1 : 0.2;
-        const { audioContext, channels, options } = this;
-        for (let i = 0; i < channels.length; i++) {
-            channels[i].reverbEffect = options.reverbAlgorithm(audioContext);
-        }
+        this.reverb.feedback = (type === 8) ? 0.9 : 0.8;
+        const { audioContext, options } = this;
+        this.reverbEffect = options.reverbAlgorithm(audioContext);
     }
     getReverbTimeFromType(type) {
         switch (type) {
@@ -1659,15 +1686,17 @@ class MidyGM2 {
         return value * 0.00763;
     }
     setChorusSendToReverb(value) {
-        const now = this.audioContext.currentTime;
         const sendToReverb = this.getChorusSendToReverb(value);
-        this.chorus.sendToReverb = sendToReverb;
-        for (let i = 0; i < this.channels.length; i++) {
-            const chorusEffect = this.channels[i].chorusEffect;
-            chorusEffect.sendGain.gain
+        if (0 < sendToReverb) {
+            const now = this.audioContext.currentTime;
+            this.chorus.sendToReverb = sendToReverb;
+            this.chorusEffect.sendGain.gain
                 .cancelScheduledValues(now)
                 .setValueAtTime(sendToReverb, now);
         }
+        else if (this.chorus.sendToReverb !== 0) {
+            this.chorusEffect.sendGain.disconnect(this.reverbEffect.input);
+        }
     }
     getChorusSendToReverb(value) {
         return value * 0.00787;
@@ -1709,6 +1738,9 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         portamentoTime: 0,
         reverbSendLevel: 0,
         chorusSendLevel: 0,
+        vibratoRate: 1,
+        vibratoDepth: 1,
+        vibratoDelay: 1,
         bank: 121 * 128,
         bankMSB: 121,
         bankLSB: 0,
@@ -1718,7 +1750,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         pitchBend: 0,
         fineTuning: 0, // cb
         coarseTuning: 0, // cb
-        modulationDepthRange: 0.5, // cb
+        modulationDepthRange: 50, // cent
     }
 });
 Object.defineProperty(MidyGM2, "effectSettings", {
@@ -1727,7 +1759,7 @@ Object.defineProperty(MidyGM2, "effectSettings", {
     writable: true,
     value: {
         expression: 1,
-        modulation: 0,
+        modulationDepth: 0,
         sustainPedal: false,
         portamento: false,
         sostenutoPedal: false,