@marmooo/midy 0.1.4 → 0.1.6

package/esm/midy-GM2.js

@@ -1,5 +1,5 @@
 import { parseMidi } from "./deps/cdn.jsdelivr.net/npm/midi-file@1.2.4/+esm.js";
-import { parse, SoundFont, } from "./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.4/+esm.js";
+import { parse, SoundFont, } from "./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.6/+esm.js";
 class Note {
     constructor(noteNumber, velocity, startTime, instrumentKey) {
         Object.defineProperty(this, "bufferSource", {
@@ -230,6 +230,7 @@ export class MidyGM2 {
         this.audioContext = audioContext;
         this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
+        this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
         this.reverbEffect = this.options.reverbAlgorithm(audioContext);
         this.chorusEffect = this.createChorusEffect(audioContext);
@@ -248,12 +249,14 @@ export class MidyGM2 {
     addSoundFont(soundFont) {
         const index = this.soundFonts.length;
         this.soundFonts.push(soundFont);
-        soundFont.parsed.presetHeaders.forEach((presetHeader) => {
+        const presetHeaders = soundFont.parsed.presetHeaders;
+        for (let i = 0; i < presetHeaders.length; i++) {
+            const presetHeader = presetHeaders[i];
             if (!presetHeader.presetName.startsWith("\u0000")) { // TODO: Only SF3 generated by PolyPone?
                 const banks = this.soundFontTable[presetHeader.preset];
                 banks.set(presetHeader.bank, index);
             }
-        });
+        }
     }
     async loadSoundFont(soundFontUrl) {
         const response = await fetch(soundFontUrl);
@@ -302,27 +305,25 @@ export class MidyGM2 {
         return channels;
     }
     async createNoteBuffer(instrumentKey, isSF3) {
+        const sampleStart = instrumentKey.start;
         const sampleEnd = instrumentKey.sample.length + instrumentKey.end;
         if (isSF3) {
-            const sample = new Uint8Array(instrumentKey.sample.length);
-            sample.set(instrumentKey.sample);
+            const sample = instrumentKey.sample.slice(sampleStart, sampleEnd);
             const audioBuffer = await this.audioContext.decodeAudioData(sample.buffer);
-            for (let channel = 0; channel < audioBuffer.numberOfChannels; channel++) {
-                const channelData = audioBuffer.getChannelData(channel);
-                channelData.set(channelData.subarray(0, sampleEnd));
-            }
             return audioBuffer;
         }
         else {
-            const sample = instrumentKey.sample.subarray(0, sampleEnd);
-            const floatSample = this.convertToFloat32Array(sample);
+            const sample = instrumentKey.sample.subarray(sampleStart, sampleEnd);
             const audioBuffer = new AudioBuffer({
                 numberOfChannels: 1,
                 length: sample.length,
                 sampleRate: instrumentKey.sampleRate,
             });
             const channelData = audioBuffer.getChannelData(0);
-            channelData.set(floatSample);
+            const int16Array = new Int16Array(sample.buffer);
+            for (let i = 0; i < int16Array.length; i++) {
+                channelData[i] = int16Array[i] / 32768;
+            }
             return audioBuffer;
         }
     }
@@ -338,13 +339,23 @@ export class MidyGM2 {
         }
         return bufferSource;
     }
-    convertToFloat32Array(uint8Array) {
-        const int16Array = new Int16Array(uint8Array.buffer);
-        const float32Array = new Float32Array(int16Array.length);
-        for (let i = 0; i < int16Array.length; i++) {
-            float32Array[i] = int16Array[i] / 32768;
+    findPortamentoTarget(queueIndex) {
+        const endEvent = this.timeline[queueIndex];
+        if (!this.channels[endEvent.channel].portamento)
+            return;
+        const endTime = endEvent.startTime;
+        let target;
+        while (++queueIndex < this.timeline.length) {
+            const event = this.timeline[queueIndex];
+            if (endTime !== event.startTime)
+                break;
+            if (event.type !== "noteOn")
+                continue;
+            if (!target || event.noteNumber < target.noteNumber) {
+                target = event;
+            }
         }
-        return float32Array;
+        return target;
     }
     async scheduleTimelineEvents(t, offset, queueIndex) {
         while (queueIndex < this.timeline.length) {
@@ -354,12 +365,15 @@ export class MidyGM2 {
             switch (event.type) {
                 case "noteOn":
                     if (event.velocity !== 0) {
-                        await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
+                        await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset, event.portamento);
                         break;
                     }
                 /* falls through */
                 case "noteOff": {
-                    const notePromise = this.scheduleNoteRelease(this.omni ? 0 : event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
+                    const portamentoTarget = this.findPortamentoTarget(queueIndex);
+                    if (portamentoTarget)
+                        portamentoTarget.portamento = true;
+                    const notePromise = this.scheduleNoteRelease(this.omni ? 0 : event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset, portamentoTarget?.noteNumber, false);
                     if (notePromise) {
                         this.notePromises.push(notePromise);
                     }
@@ -460,9 +474,11 @@ export class MidyGM2 {
                 bankLSB: this.channels[i].bankLSB,
             };
         }
-        midi.tracks.forEach((track) => {
+        for (let i = 0; i < midi.tracks.length; i++) {
+            const track = midi.tracks[i];
             let currentTicks = 0;
-            track.forEach((event) => {
+            for (let j = 0; j < track.length; j++) {
+                const event = track[j];
                 currentTicks += event.deltaTime;
                 event.ticks = currentTicks;
                 switch (event.type) {
@@ -515,16 +531,18 @@ export class MidyGM2 {
                 }
                 delete event.deltaTime;
                 timeline.push(event);
-            });
-        });
+            }
+        }
         const priority = {
             controller: 0,
             sysEx: 1,
+            noteOff: 2, // for portamento
+            noteOn: 3,
         };
         timeline.sort((a, b) => {
             if (a.ticks !== b.ticks)
                 return a.ticks - b.ticks;
-            return (priority[a.type] || 2) - (priority[b.type] || 2);
+            return (priority[a.type] || 4) - (priority[b.type] || 4);
         });
         let prevTempoTime = 0;
         let prevTempoTicks = 0;
@@ -541,7 +559,7 @@ export class MidyGM2 {
         }
         return { instruments, timeline };
     }
-    async stopChannelNotes(channelNumber, velocity, stopPedal) {
+    async stopChannelNotes(channelNumber, velocity, force) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.scheduledNotes.forEach((noteList) => {
@@ -549,16 +567,17 @@ export class MidyGM2 {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
+                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, undefined, // portamentoNoteNumber
+                force);
                 this.notePromises.push(promise);
             }
         });
         channel.scheduledNotes.clear();
         await Promise.all(this.notePromises);
     }
-    stopNotes(velocity, stopPedal) {
+    stopNotes(velocity, force) {
         for (let i = 0; i < this.channels.length; i++) {
-            this.stopChannelNotes(i, velocity, stopPedal);
+            this.stopChannelNotes(i, velocity, force);
         }
         return Promise.all(this.notePromises);
     }
@@ -772,6 +791,17 @@ export class MidyGM2 {
         return instrumentKey.playbackRate(noteNumber) *
             Math.pow(2, semitoneOffset / 12);
     }
+    setPortamentoStartVolumeEnvelope(channel, note) {
+        const { instrumentKey, startTime } = note;
+        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
+        const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
+        const volDelay = startTime + instrumentKey.volDelay;
+        const portamentoTime = volDelay + channel.portamentoTime;
+        note.volumeNode.gain
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(0, volDelay)
+            .linearRampToValueAtTime(sustainVolume, portamentoTime);
+    }
     setVolumeEnvelope(note) {
         const { instrumentKey, startTime } = note;
         const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
@@ -811,6 +841,25 @@ export class MidyGM2 {
         const maxFrequency = 20000; // max Hz of initialFilterFc
         return Math.max(minFrequency, Math.min(frequency, maxFrequency));
     }
+    setPortamentoStartFilterEnvelope(channel, note) {
+        const { instrumentKey, noteNumber, startTime } = note;
+        const softPedalFactor = 1 -
+            (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
+        const baseFreq = this.centToHz(instrumentKey.initialFilterFc) *
+            softPedalFactor;
+        const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
+        const sustainFreq = baseFreq +
+            (peekFreq - baseFreq) * (1 - instrumentKey.modSustain);
+        const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
+        const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq);
+        const portamentoTime = startTime + channel.portamentoTime;
+        const modDelay = startTime + instrumentKey.modDelay;
+        note.filterNode.frequency
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(adjustedBaseFreq, startTime)
+            .setValueAtTime(adjustedBaseFreq, modDelay)
+            .linearRampToValueAtTime(adjustedSustainFreq, portamentoTime);
+    }
     setFilterEnvelope(channel, note) {
         const { instrumentKey, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
@@ -878,17 +927,23 @@ export class MidyGM2 {
         note.vibratoLFO.connect(note.vibratoDepth);
         note.vibratoDepth.connect(note.bufferSource.detune);
     }
-    async createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3) {
+    async createNote(channel, instrumentKey, noteNumber, velocity, startTime, portamento, isSF3) {
         const semitoneOffset = this.calcSemitoneOffset(channel);
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
         note.volumeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
-            Q: instrumentKey.initialFilterQ / 10 * channel.filterResonance, // dB
+            Q: instrumentKey.initialFilterQ / 10, // dB
         });
-        this.setVolumeEnvelope(note);
-        this.setFilterEnvelope(channel, note);
+        if (portamento) {
+            this.setPortamentoStartVolumeEnvelope(channel, note);
+            this.setPortamentoStartFilterEnvelope(channel, note);
+        }
+        else {
+            this.setVolumeEnvelope(note);
+            this.setFilterEnvelope(channel, note);
+        }
         if (0 < channel.vibratoDepth) {
             this.startVibrato(channel, note, startTime);
         }
@@ -905,7 +960,7 @@ export class MidyGM2 {
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeNode);
-        note.bufferSource.start(startTime, instrumentKey.start / instrumentKey.sampleRate);
+        note.bufferSource.start(startTime);
         return note;
     }
     calcBank(channel, channelNumber) {
@@ -917,7 +972,7 @@ export class MidyGM2 {
         }
         return channel.bank;
     }
-    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
+    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, portamento) {
         const channel = this.channels[channelNumber];
         const bankNumber = this.calcBank(channel, channelNumber);
         const soundFontIndex = this.soundFontTable[channel.program].get(bankNumber);
@@ -925,10 +980,10 @@ export class MidyGM2 {
             return;
         const soundFont = this.soundFonts[soundFontIndex];
         const isSF3 = soundFont.parsed.info.version.major === 3;
-        const instrumentKey = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber);
+        const instrumentKey = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber, velocity);
         if (!instrumentKey)
             return;
-        const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
+        const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, portamento, isSF3);
         note.volumeNode.connect(channel.gainL);
         note.volumeNode.connect(channel.gainR);
         if (channel.sostenutoPedal) {
@@ -942,16 +997,47 @@ export class MidyGM2 {
             scheduledNotes.set(noteNumber, [note]);
         }
     }
-    noteOn(channelNumber, noteNumber, velocity) {
+    noteOn(channelNumber, noteNumber, velocity, portamento) {
         const now = this.audioContext.currentTime;
-        return this.scheduleNoteOn(channelNumber, noteNumber, velocity, now);
+        return this.scheduleNoteOn(channelNumber, noteNumber, velocity, now, portamento);
+    }
+    stopNote(stopTime, endTime, scheduledNotes, index) {
+        const note = scheduledNotes[index];
+        note.volumeNode.gain
+            .cancelScheduledValues(stopTime)
+            .linearRampToValueAtTime(0, endTime);
+        note.ending = true;
+        this.scheduleTask(() => {
+            note.bufferSource.loop = false;
+        }, endTime);
+        return new Promise((resolve) => {
+            note.bufferSource.onended = () => {
+                scheduledNotes[index] = null;
+                note.bufferSource.disconnect();
+                note.volumeNode.disconnect();
+                note.filterNode.disconnect();
+                if (note.modulationDepth) {
+                    note.volumeDepth.disconnect();
+                    note.modulationDepth.disconnect();
+                    note.modulationLFO.stop();
+                }
+                if (note.vibratoDepth) {
+                    note.vibratoDepth.disconnect();
+                    note.vibratoLFO.stop();
+                }
+                resolve();
+            };
+            note.bufferSource.stop(endTime);
+        });
     }
-    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, stopPedal = false) {
+    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, portamentoNoteNumber, force) {
         const channel = this.channels[channelNumber];
-        if (stopPedal && channel.sustainPedal)
-            return;
-        if (stopPedal && channel.sostenutoNotes.has(noteNumber))
-            return;
+        if (!force) {
+            if (channel.sustainPedal)
+                return;
+            if (channel.sostenutoNotes.has(noteNumber))
+                return;
+        }
         if (!channel.scheduledNotes.has(noteNumber))
             return;
         const scheduledNotes = channel.scheduledNotes.get(noteNumber);
@@ -961,43 +1047,28 @@ export class MidyGM2 {
                 continue;
             if (note.ending)
                 continue;
-            const volEndTime = stopTime + note.instrumentKey.volRelease;
-            note.volumeNode.gain
-                .cancelScheduledValues(stopTime)
-                .linearRampToValueAtTime(0, volEndTime);
-            const modRelease = stopTime + note.instrumentKey.modRelease;
-            note.filterNode.frequency
-                .cancelScheduledValues(stopTime)
-                .linearRampToValueAtTime(0, modRelease);
-            note.ending = true;
-            this.scheduleTask(() => {
-                note.bufferSource.loop = false;
-            }, stopTime);
-            return new Promise((resolve) => {
-                note.bufferSource.onended = () => {
-                    scheduledNotes[i] = null;
-                    note.bufferSource.disconnect();
-                    note.volumeNode.disconnect();
-                    note.filterNode.disconnect();
-                    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);
-            });
+            if (portamentoNoteNumber === undefined) {
+                const volEndTime = stopTime + note.instrumentKey.volRelease;
+                const modRelease = stopTime + note.instrumentKey.modRelease;
+                note.filterNode.frequency
+                    .cancelScheduledValues(stopTime)
+                    .linearRampToValueAtTime(0, modRelease);
+                return this.stopNote(stopTime, volEndTime, scheduledNotes, i);
+            }
+            else {
+                const portamentoTime = stopTime + channel.portamentoTime;
+                const detuneChange = (portamentoNoteNumber - noteNumber) * 100;
+                const detune = note.bufferSource.detune.value + detuneChange;
+                note.bufferSource.detune
+                    .cancelScheduledValues(stopTime)
+                    .linearRampToValueAtTime(detune, portamentoTime);
+                return this.stopNote(stopTime, portamentoTime, scheduledNotes, i);
+            }
         }
     }
-    releaseNote(channelNumber, noteNumber, velocity) {
+    releaseNote(channelNumber, noteNumber, velocity, portamentoNoteNumber) {
         const now = this.audioContext.currentTime;
-        return this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now);
+        return this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, portamentoNoteNumber, false);
     }
     releaseSustainPedal(channelNumber, halfVelocity) {
         const velocity = halfVelocity * 2;
@@ -1081,58 +1152,41 @@ export class MidyGM2 {
             channel.pitchBendRange * 100;
         this.updateDetune(channel, detuneChange);
     }
+    createControlChangeHandlers() {
+        return {
+            0: this.setBankMSB,
+            1: this.setModulationDepth,
+            5: this.setPortamentoTime,
+            6: this.dataEntryMSB,
+            7: this.setVolume,
+            10: this.setPan,
+            11: this.setExpression,
+            32: this.setBankLSB,
+            38: this.dataEntryLSB,
+            64: this.setSustainPedal,
+            65: this.setPortamento,
+            66: this.setSostenutoPedal,
+            67: this.setSoftPedal,
+            91: this.setReverbSendLevel,
+            93: this.setChorusSendLevel,
+            100: this.setRPNLSB,
+            101: this.setRPNMSB,
+            120: this.allSoundOff,
+            121: this.resetAllControllers,
+            123: this.allNotesOff,
+            124: this.omniOff,
+            125: this.omniOn,
+            126: this.monoOn,
+            127: this.polyOn,
+        };
+    }
     handleControlChange(channelNumber, controller, value) {
-        switch (controller) {
-            case 0:
-                return this.setBankMSB(channelNumber, value);
-            case 1:
-                return this.setModulationDepth(channelNumber, value);
-            case 5:
-                return this.setPortamentoTime(channelNumber, value);
-            case 6:
-                return this.dataEntryMSB(channelNumber, value);
-            case 7:
-                return this.setVolume(channelNumber, value);
-            case 10:
-                return this.setPan(channelNumber, value);
-            case 11:
-                return this.setExpression(channelNumber, value);
-            case 32:
-                return this.setBankLSB(channelNumber, value);
-            case 38:
-                return this.dataEntryLSB(channelNumber, value);
-            case 64:
-                return this.setSustainPedal(channelNumber, value);
-            case 65:
-                return this.setPortamento(channelNumber, value);
-            case 66:
-                return this.setSostenutoPedal(channelNumber, value);
-            case 67:
-                return this.setSoftPedal(channelNumber, value);
-            case 91:
-                return this.setReverbSendLevel(channelNumber, value);
-            case 93:
-                return this.setChorusSendLevel(channelNumber, value);
-            case 100:
-                return this.setRPNLSB(channelNumber, value);
-            case 101:
-                return this.setRPNMSB(channelNumber, value);
-            case 120:
-                return this.allSoundOff(channelNumber);
-            case 121:
-                return this.resetAllControllers(channelNumber);
-            case 123:
-                return this.allNotesOff(channelNumber);
-            case 124:
-                return this.omniOff();
-            case 125:
-                return this.omniOn();
-            case 126:
-                return this.monoOn();
-            case 127:
-                return this.polyOn();
-            default:
-                console.warn(`Unsupported Control change: controller=${controller} value=${value}`);
+        const handler = this.controlChangeHandlers[controller];
+        if (handler) {
+            handler.call(this, channelNumber, value);
+        }
+        else {
+            console.warn(`Unsupported Control change: controller=${controller} value=${value}`);
         }
     }
     setBankMSB(channelNumber, msb) {
@@ -1162,12 +1216,14 @@ export class MidyGM2 {
         this.updateModulation(channel);
     }
     setPortamentoTime(channelNumber, portamentoTime) {
-        this.channels[channelNumber].portamentoTime = portamentoTime / 127;
+        const channel = this.channels[channelNumber];
+        const factor = 5 * Math.log(10) / 127;
+        channel.portamentoTime = Math.exp(factor * portamentoTime);
     }
     setVolume(channelNumber, volume) {
         const channel = this.channels[channelNumber];
         channel.volume = volume / 127;
-        this.updateChannelGain(channel);
+        this.updateChannelVolume(channel);
     }
     panToGain(pan) {
         const theta = Math.PI / 2 * Math.max(0, pan - 1) / 126;
@@ -1179,12 +1235,12 @@ export class MidyGM2 {
     setPan(channelNumber, pan) {
         const channel = this.channels[channelNumber];
         channel.pan = pan;
-        this.updateChannelGain(channel);
+        this.updateChannelVolume(channel);
     }
     setExpression(channelNumber, expression) {
         const channel = this.channels[channelNumber];
         channel.expression = expression / 127;
-        this.updateChannelGain(channel);
+        this.updateChannelVolume(channel);
     }
     setBankLSB(channelNumber, lsb) {
         this.channels[channelNumber].bankLSB = lsb;
@@ -1193,7 +1249,7 @@ export class MidyGM2 {
         this.channels[channelNumber].dataLSB = value;
         this.handleRPN(channelNumber);
     }
-    updateChannelGain(channel) {
+    updateChannelVolume(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
         const { gainLeft, gainRight } = this.panToGain(channel.pan);
@@ -1211,34 +1267,55 @@ export class MidyGM2 {
             this.releaseSustainPedal(channelNumber, value);
         }
     }
-    // TODO
     setPortamento(channelNumber, value) {
         this.channels[channelNumber].portamento = value >= 64;
     }
     setReverbSendLevel(channelNumber, reverbSendLevel) {
         const channel = this.channels[channelNumber];
         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);
+        if (0 < channel.reverbSendLevel) {
+            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 {
+                channel.merger.disconnect(reverbEffect.input);
+            }
         }
-        else if (channel.reverbSendLevel !== 0) {
-            channel.merger.disconnect(reverbEffect.input);
+        else {
+            if (0 < reverbSendLevel) {
+                channel.merger.connect(reverbEffect.input);
+                const now = this.audioContext.currentTime;
+                channel.reverbSendLevel = reverbSendLevel / 127;
+                reverbEffect.output.gain.cancelScheduledValues(now);
+                reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
+            }
         }
     }
     setChorusSendLevel(channelNumber, chorusSendLevel) {
         const channel = this.channels[channelNumber];
         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);
+        if (0 < channel.chorusSendLevel) {
+            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 {
+                channel.merger.disconnect(chorusEffect.input);
+            }
         }
-        else if (channel.chorusSendLevel !== 0) {
-            channel.merger.disconnect(chorusEffect.input);
+        else {
+            if (0 < chorusSendLevel) {
+                channel.merger.connect(chorusEffect.input);
+                const now = this.audioContext.currentTime;
+                channel.chorusSendLevel = chorusSendLevel / 127;
+                chorusEffect.output.gain.cancelScheduledValues(now);
+                chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+            }
         }
     }
     setSostenutoPedal(channelNumber, value) {
@@ -1423,20 +1500,22 @@ export class MidyGM2 {
         }
     }
     GM1SystemOn() {
-        this.channels.forEach((channel) => {
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
             channel.bankMSB = 0;
             channel.bankLSB = 0;
             channel.bank = 0;
-        });
+        }
         this.channels[9].bankMSB = 1;
         this.channels[9].bank = 128;
     }
     GM2SystemOn() {
-        this.channels.forEach((channel) => {
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
             channel.bankMSB = 121;
             channel.bankLSB = 0;
             channel.bank = 121 * 128;
-        });
+        }
         this.channels[9].bankMSB = 120;
         this.channels[9].bank = 120 * 128;
     }
@@ -1745,7 +1824,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         currentBufferSource: null,
         volume: 100 / 127,
         pan: 64,
-        portamentoTime: 0,
+        portamentoTime: 1, // sec
         reverbSendLevel: 0,
         chorusSendLevel: 0,
         vibratoRate: 1,