@marmooo/midy 0.0.3 → 0.0.5

package/esm/midy.js

@@ -1,5 +1,55 @@
 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.1/+esm.js";
+import { parse, SoundFont, } from "./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.2/+esm.js";
+class Note {
+    constructor(noteNumber, velocity, startTime, instrumentKey) {
+        Object.defineProperty(this, "bufferSource", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "gainNode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "filterNode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "modLFO", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "modLFOGain", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "vibLFO", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "vibLFOGain", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.noteNumber = noteNumber;
+        this.velocity = velocity;
+        this.startTime = startTime;
+        this.instrumentKey = instrumentKey;
+    }
+}
 export class Midy {
     constructor(audioContext) {
         Object.defineProperty(this, "ticksPerBeat", {
@@ -181,10 +231,8 @@ export class Midy {
         const pannerNode = new StereoPannerNode(audioContext, {
             pan: Midy.channelSettings.pan,
         });
-        const modulationEffect = this.createModulationEffect(audioContext);
         const reverbEffect = this.createReverbEffect(audioContext);
         const chorusEffect = this.createChorusEffect(audioContext);
-        modulationEffect.lfo.start();
         chorusEffect.lfo.start();
         reverbEffect.dryGain.connect(pannerNode);
         reverbEffect.wetGain.connect(pannerNode);
@@ -193,7 +241,6 @@ export class Midy {
         return {
             gainNode,
             pannerNode,
-            modulationEffect,
             reverbEffect,
             chorusEffect,
         };
@@ -206,15 +253,21 @@ export class Midy {
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
+                polyphonicKeyPressure: {
+                    ...Midy.controllerDestinationSettings,
+                },
+                channelPressure: {
+                    ...Midy.controllerDestinationSettings,
+                },
             };
         });
         return channels;
     }
-    async createNoteBuffer(noteInfo, isSF3) {
-        const sampleEnd = noteInfo.sample.length + noteInfo.end;
+    async createNoteBuffer(instrumentKey, isSF3) {
+        const sampleEnd = instrumentKey.sample.length + instrumentKey.end;
         if (isSF3) {
-            const sample = new Uint8Array(noteInfo.sample.length);
-            sample.set(noteInfo.sample);
+            const sample = new Uint8Array(instrumentKey.sample.length);
+            sample.set(instrumentKey.sample);
             const audioBuffer = await this.audioContext.decodeAudioData(sample.buffer);
             for (let channel = 0; channel < audioBuffer.numberOfChannels; channel++) {
                 const channelData = audioBuffer.getChannelData(channel);
@@ -223,26 +276,27 @@ export class Midy {
             return audioBuffer;
         }
         else {
-            const sample = noteInfo.sample.subarray(0, sampleEnd);
+            const sample = instrumentKey.sample.subarray(0, sampleEnd);
             const floatSample = this.convertToFloat32Array(sample);
             const audioBuffer = new AudioBuffer({
                 numberOfChannels: 1,
                 length: sample.length,
-                sampleRate: noteInfo.sampleRate,
+                sampleRate: instrumentKey.sampleRate,
             });
             const channelData = audioBuffer.getChannelData(0);
             channelData.set(floatSample);
             return audioBuffer;
         }
     }
-    async createNoteBufferNode(noteInfo, isSF3) {
+    async createNoteBufferNode(instrumentKey, isSF3) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
-        const audioBuffer = await this.createNoteBuffer(noteInfo, isSF3);
+        const audioBuffer = await this.createNoteBuffer(instrumentKey, isSF3);
         bufferSource.buffer = audioBuffer;
-        bufferSource.loop = noteInfo.sampleModes % 2 !== 0;
+        bufferSource.loop = instrumentKey.sampleModes % 2 !== 0;
         if (bufferSource.loop) {
-            bufferSource.loopStart = noteInfo.loopStart / noteInfo.sampleRate;
-            bufferSource.loopEnd = noteInfo.loopEnd / noteInfo.sampleRate;
+            bufferSource.loopStart = instrumentKey.loopStart /
+                instrumentKey.sampleRate;
+            bufferSource.loopEnd = instrumentKey.loopEnd / instrumentKey.sampleRate;
         }
         return bufferSource;
     }
@@ -260,9 +314,6 @@ export class Midy {
             if (event.startTime > t + this.lookAhead)
                 break;
             switch (event.type) {
-                case "controller":
-                    this.handleControlChange(this.omni ? 0 : event.channel, event.controllerType, event.value);
-                    break;
                 case "noteOn":
                     if (event.velocity !== 0) {
                         await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
@@ -276,9 +327,21 @@ export class Midy {
                     }
                     break;
                 }
+                case "noteAftertouch":
+                    this.handlePolyphonicKeyPressure(event.channel, event.noteNumber, event.amount);
+                    break;
+                case "controller":
+                    this.handleControlChange(this.omni ? 0 : event.channel, event.controllerType, event.value);
+                    break;
                 case "programChange":
                     this.handleProgramChange(event.channel, event.programNumber);
                     break;
+                case "channelAftertouch":
+                    this.handleChannelPressure(event.channel, event.amount);
+                    break;
+                case "pitchBend":
+                    this.handlePitchBend(event.channel, event.value);
+                    break;
                 case "sysEx":
                     this.handleSysEx(event.data);
             }
@@ -515,30 +578,26 @@ export class Midy {
         const now = this.audioContext.currentTime;
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
-    getActiveNotes(channel) {
+    getActiveNotes(channel, time) {
         const activeNotes = new Map();
-        channel.scheduledNotes.forEach((scheduledNotes) => {
-            const activeNote = this.getActiveChannelNotes(scheduledNotes);
+        channel.scheduledNotes.forEach((noteList) => {
+            const activeNote = this.getActiveNote(noteList, time);
             if (activeNote) {
                 activeNotes.set(activeNote.noteNumber, activeNote);
             }
         });
         return activeNotes;
     }
-    getActiveChannelNotes(scheduledNotes) {
-        for (let i = 0; i < scheduledNotes; i++) {
-            const scheduledNote = scheduledNotes[i];
-            if (scheduledNote)
-                return scheduledNote;
+    getActiveNote(noteList, time) {
+        for (let i = noteList.length - 1; i >= 0; i--) {
+            const note = noteList[i];
+            if (!note)
+                return;
+            if (time < note.startTime)
+                continue;
+            return (note.ending) ? null : note;
         }
-    }
-    createModulationEffect(audioContext) {
-        const lfo = new OscillatorNode(audioContext, {
-            frequency: 5,
-        });
-        return {
-            lfo,
-        };
+        return noteList[0];
     }
     createReverbEffect(audioContext, options = {}) {
         const { decay = 0.8, preDecay = 0, } = options;
@@ -642,79 +701,116 @@ export class Midy {
     centToHz(cent) {
         return 8.176 * Math.pow(2, cent / 1200);
     }
-    async createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3) {
+    calcSemitoneOffset(channel) {
         const masterTuning = this.masterCoarseTuning + this.masterFineTuning;
         const channelTuning = channel.coarseTuning + channel.fineTuning;
         const tuning = masterTuning + channelTuning;
-        const semitoneOffset = channel.pitchBend * channel.pitchBendRange + tuning;
-        const playbackRate = noteInfo.playbackRate(noteNumber) *
+        return channel.pitchBend * channel.pitchBendRange + tuning;
+    }
+    calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset) {
+        return instrumentKey.playbackRate(noteNumber) *
             Math.pow(2, semitoneOffset / 12);
-        const bufferSource = await this.createNoteBufferNode(noteInfo, isSF3);
-        bufferSource.playbackRate.value = playbackRate;
-        // volume envelope
-        const gainNode = new GainNode(this.audioContext, {
+    }
+    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(-noteInfo.initialAttenuation) * volume;
-        const sustainVolume = attackVolume * (1 - noteInfo.volSustain);
-        const volDelay = startTime + noteInfo.volDelay;
-        const volAttack = volDelay + noteInfo.volAttack;
-        const volHold = volAttack + noteInfo.volHold;
-        const volDecay = volHold + noteInfo.volDecay;
-        gainNode.gain
+        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation) *
+            volume;
+        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
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
             .linearRampToValueAtTime(sustainVolume, volDecay);
-        // filter envelope
+    }
+    setFilterEnvelope(channel, note) {
+        const { instrumentKey, startTime, noteNumber } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
         const maxFreq = this.audioContext.sampleRate / 2;
-        const baseFreq = this.centToHz(noteInfo.initialFilterFc) * softPedalFactor;
-        const peekFreq = this.centToHz(noteInfo.initialFilterFc + noteInfo.modEnvToFilterFc) * softPedalFactor;
+        const baseFreq = this.centToHz(instrumentKey.initialFilterFc) *
+            softPedalFactor;
+        const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
         const sustainFreq = (baseFreq +
-            (peekFreq - baseFreq) * (1 - noteInfo.modSustain)) * softPedalFactor;
+            (peekFreq - baseFreq) * (1 - instrumentKey.modSustain)) * softPedalFactor;
+        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);
-        const filterNode = new BiquadFilterNode(this.audioContext, {
+        note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
-            Q: noteInfo.initialFilterQ / 10, // dB
+            Q: instrumentKey.initialFilterQ / 10, // dB
             frequency: adjustedBaseFreq,
         });
-        const modDelay = startTime + noteInfo.modDelay;
-        const modAttack = modDelay + noteInfo.modAttack;
-        const modHold = modAttack + noteInfo.modHold;
-        const modDecay = modHold + noteInfo.modDecay;
-        filterNode.frequency
+        note.filterNode.frequency
             .setValueAtTime(adjustedBaseFreq, modDelay)
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
             .linearRampToValueAtTime(adjustedSustainFreq, modDecay);
-        let lfoGain;
+        note.bufferSource.detune.setValueAtTime(note.bufferSource.detune.value + instrumentKey.modEnvToPitch, modDelay);
+    }
+    startModulation(channel, note, time) {
+        const { instrumentKey } = note;
+        note.modLFOGain = new GainNode(this.audioContext, {
+            gain: this.cbToRatio(instrumentKey.modLfoToVolume) * channel.modulation,
+        });
+        note.modLFO = 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);
+    }
+    startVibrato(channel, note, time) {
+        const { instrumentKey } = note;
+        note.vibLFOGain = new GainNode(this.audioContext, {
+            gain: channel.vibratoDepth,
+        });
+        note.vibLFO = new OscillatorNode(this.audioContext, {
+            frequency: this.centToHz(instrumentKey.freqModLFO) +
+                channel.vibratoRate,
+        });
+        note.vibLFO.start(time + channel.vibratoDelay);
+        note.vibLFO.connect(note.vibLFOGain);
+        note.vibLFOGain.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 vibratoDelay = startTime + channel.vibratoDelay;
-            const vibratoAttack = vibratoDelay + 0.1;
-            lfoGain = new GainNode(this.audioContext, {
-                gain: 0,
-            });
-            lfoGain.gain
-                .setValueAtTime(1e-6, vibratoDelay) // exponentialRampToValueAtTime() requires a non-zero value
-                .exponentialRampToValueAtTime(channel.modulation, vibratoAttack);
-            channel.modulationEffect.lfo.connect(lfoGain);
-            lfoGain.connect(bufferSource.detune);
+            const delayModLFO = startTime + instrumentKey.delayModLFO;
+            this.startModulation(channel, note, delayModLFO);
+        }
+        if (channel.vibratoDepth > 0) {
+            const delayVibLFO = startTime + instrumentKey.delayVibLFO;
+            this.startVibrato(channel, note, delayVibLFO);
         }
-        bufferSource.connect(filterNode);
-        filterNode.connect(gainNode);
         if (this.mono && channel.currentBufferSource) {
             channel.currentBufferSource.stop(startTime);
-            channel.currentBufferSource = bufferSource;
+            channel.currentBufferSource = note.bufferSource;
         }
-        bufferSource.start(startTime, noteInfo.start / noteInfo.sampleRate);
-        return { bufferSource, gainNode, filterNode };
+        note.bufferSource.connect(note.filterNode);
+        note.filterNode.connect(note.gainNode);
+        note.bufferSource.start(startTime, instrumentKey.start / instrumentKey.sampleRate);
+        return note;
     }
     calcBank(channel, channelNumber) {
         if (channel.bankMSB === 121) {
@@ -733,36 +829,20 @@ export class Midy {
             return;
         const soundFont = this.soundFonts[soundFontIndex];
         const isSF3 = soundFont.parsed.info.version.major === 3;
-        const noteInfo = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber);
-        if (!noteInfo)
+        const instrumentKey = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber);
+        if (!instrumentKey)
             return;
-        const { bufferSource, gainNode, filterNode } = await this
-            .createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3);
-        this.connectNoteEffects(channel, gainNode);
+        const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
+        this.connectNoteEffects(channel, note.gainNode);
         if (channel.sostenutoPedal) {
-            channel.sostenutoNotes.set(noteNumber, {
-                gainNode,
-                filterNode,
-                bufferSource,
-                noteNumber,
-                noteInfo,
-            });
+            channel.sostenutoNotes.set(noteNumber, note);
         }
         const scheduledNotes = channel.scheduledNotes;
-        const scheduledNote = {
-            bufferSource,
-            filterNode,
-            gainNode,
-            lfoGain,
-            noteInfo,
-            noteNumber,
-            startTime,
-        };
         if (scheduledNotes.has(noteNumber)) {
-            scheduledNotes.get(noteNumber).push(scheduledNote);
+            scheduledNotes.get(noteNumber).push(note);
         }
         else {
-            scheduledNotes.set(noteNumber, [scheduledNote]);
+            scheduledNotes.set(noteNumber, [note]);
         }
     }
     noteOn(channelNumber, noteNumber, velocity) {
@@ -784,15 +864,15 @@ export class Midy {
                 continue;
             if (targetNote.ending)
                 continue;
-            const { bufferSource, filterNode, gainNode, lfoGain, noteInfo } = targetNote;
+            const { bufferSource, filterNode, gainNode, modLFO, modLFOGain, vibLFO, vibLFOGain, instrumentKey, } = targetNote;
             const velocityRate = (velocity + 127) / 127;
-            const volEndTime = stopTime + noteInfo.volRelease * velocityRate;
+            const volEndTime = stopTime + instrumentKey.volRelease * velocityRate;
             gainNode.gain.cancelScheduledValues(stopTime);
             gainNode.gain.linearRampToValueAtTime(0, volEndTime);
             const maxFreq = this.audioContext.sampleRate / 2;
-            const baseFreq = this.centToHz(noteInfo.initialFilterFc);
+            const baseFreq = this.centToHz(instrumentKey.initialFilterFc);
             const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-            const modEndTime = stopTime + noteInfo.modRelease * velocityRate;
+            const modEndTime = stopTime + instrumentKey.modRelease * velocityRate;
             filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(adjustedBaseFreq, modEndTime);
@@ -806,8 +886,14 @@ export class Midy {
                     bufferSource.disconnect(0);
                     filterNode.disconnect(0);
                     gainNode.disconnect(0);
-                    if (lfoGain)
-                        lfoGain.disconnect(0);
+                    if (modLFOGain)
+                        modLFOGain.disconnect(0);
+                    if (vibLFOGain)
+                        vibLFOGain.disconnect(0);
+                    if (modLFO)
+                        modLFO.stop();
+                    if (vibLFO)
+                        vibLFO.stop();
                     resolve();
                 };
                 bufferSource.stop(volEndTime);
@@ -856,7 +942,7 @@ export class Midy {
             case 0x90:
                 return this.noteOn(channelNumber, data1, data2);
             case 0xA0:
-                return this.handlePolyphonicKeyPressure(channelNumber, data1, data2);
+                return; // this.handlePolyphonicKeyPressure(channelNumber, data1, data2);
             case 0xB0:
                 return this.handleControlChange(channelNumber, data1, data2);
             case 0xC0:
@@ -864,7 +950,7 @@ export class Midy {
             case 0xD0:
                 return this.handleChannelPressure(channelNumber, data1);
             case 0xE0:
-                return this.handlePitchBend(channelNumber, data1, data2);
+                return this.handlePitchBendMessage(channelNumber, data1, data2);
             default:
                 console.warn(`Unsupported MIDI message: ${messageType.toString(16)}`);
         }
@@ -872,17 +958,16 @@ export class Midy {
     handlePolyphonicKeyPressure(channelNumber, noteNumber, pressure) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const scheduledNotes = channel.scheduledNotes.get(noteNumber);
-        pressure /= 127;
-        if (scheduledNotes) {
-            scheduledNotes.forEach((scheduledNote) => {
-                if (scheduledNote) {
-                    const { initialAttenuation } = scheduledNote.noteInfo;
-                    const gain = this.cbToRatio(-initialAttenuation) * pressure;
-                    scheduledNote.gainNode.gain.cancelScheduledValues(now);
-                    scheduledNote.gainNode.gain.setValueAtTime(gain, now);
-                }
-            });
+        pressure /= 64;
+        const activeNotes = this.getActiveNotes(channel, now);
+        if (channel.polyphonicKeyPressure.amplitudeControl !== 1) {
+            if (activeNotes.has(noteNumber)) {
+                const activeNote = activeNotes.get(noteNumber);
+                const gain = activeNote.gainNode.gain.value;
+                activeNote.gainNode.gain
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(gain * pressure, now);
+            }
         }
     }
     handleProgramChange(channelNumber, program) {
@@ -891,11 +976,37 @@ export class Midy {
         channel.program = program;
     }
     handleChannelPressure(channelNumber, pressure) {
-        this.channels[channelNumber].channelPressure = pressure;
+        const now = this.audioContext.currentTime;
+        const channel = this.channels[channelNumber];
+        pressure /= 64;
+        channel.channelPressure = pressure;
+        const activeNotes = this.getActiveNotes(channel, now);
+        if (channel.channelPressure.amplitudeControl !== 1) {
+            activeNotes.forEach((activeNote) => {
+                const gain = activeNote.gainNode.gain.value;
+                activeNote.gainNode.gain
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(gain * pressure, now);
+            });
+        }
+    }
+    handlePitchBendMessage(channelNumber, lsb, msb) {
+        const pitchBend = msb * 128 + lsb;
+        this.handlePitchBend(channelNumber, pitchBend);
     }
-    handlePitchBend(channelNumber, lsb, msb) {
-        const pitchBend = (msb * 128 + lsb - 8192) / 8192;
-        this.channels[channelNumber].pitchBend = pitchBend;
+    handlePitchBend(channelNumber, pitchBend) {
+        const now = this.audioContext.currentTime;
+        const channel = this.channels[channelNumber];
+        channel.pitchBend = (pitchBend - 8192) / 8192;
+        const semitoneOffset = this.calcSemitoneOffset(channel);
+        const activeNotes = this.getActiveNotes(channel, now);
+        activeNotes.forEach((activeNote) => {
+            const { bufferSource, instrumentKey, noteNumber } = activeNote;
+            const playbackRate = calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
+            bufferSource.playbackRate
+                .cancelScheduledValues(now)
+                .setValueAtTime(playbackRate * pressure, now);
+        });
     }
     handleControlChange(channelNumber, controller, value) {
         switch (controller) {
@@ -966,9 +1077,20 @@ export class Midy {
         this.channels[channelNumber].bankMSB = msb;
     }
     setModulation(channelNumber, modulation) {
+        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.modulation = (modulation / 127) *
             (channel.modulationDepthRange * 100);
+        const activeNotes = this.getActiveNotes(channel, now);
+        activeNotes.forEach((activeNote) => {
+            if (activeNote.modLFO) {
+                activeNote.gainNode.gain.setValueAtTime(this.cbToRatio(activeNote.instrumentKey.modLfoToVolume) *
+                    channel.modulation, now);
+            }
+            else {
+                this.startModulation(channel, activeNote, now);
+            }
+        });
     }
     setPortamentoTime(channelNumber, portamentoTime) {
         this.channels[channelNumber].portamentoTime = portamentoTime / 127;
@@ -1029,7 +1151,8 @@ export class Midy {
         const channel = this.channels[channelNumber];
         channel.sostenutoPedal = isOn;
         if (isOn) {
-            const activeNotes = this.getActiveNotes(channel);
+            const now = this.audioContext.currentTime;
+            const activeNotes = this.getActiveNotes(channel, now);
             channel.sostenutoNotes = new Map(activeNotes);
         }
         else {
@@ -1041,20 +1164,12 @@ export class Midy {
         channel.softPedal = softPedal / 127;
     }
     setVibratoRate(channelNumber, vibratoRate) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.vibratoRate = vibratoRate / 127 * 4 + 3; // 3-7Hz
-        channel.modulationEffect.lfo.frequency
-            .cancelScheduledValues(now)
-            .setValueAtTime(channel.vibratoRate, now);
     }
     setVibratoDepth(channelNumber, vibratoDepth) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.vibratoDepth = vibratoDepth / 127;
-        channel.modulationEffect.lfoGain.gain
-            .cancelScheduledValues(now)
-            .setValueAtTime(channel.vibratoDepth, now);
     }
     setVibratoDelay(channelNumber, vibratoDelay) {
         // Access Virus: 0-10sec
@@ -1135,8 +1250,8 @@ export class Midy {
         const velocity = 0;
         const stopPedal = true;
         const promises = [];
-        channel.scheduledNotes.forEach((scheduledNotes) => {
-            const activeNote = this.getActiveChannelNotes(scheduledNotes);
+        channel.scheduledNotes.forEach((noteList) => {
+            const activeNote = this.getActiveNote(noteList, now);
             if (activeNote) {
                 const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
                 promises.push(notePromise);
@@ -1153,8 +1268,8 @@ export class Midy {
         const velocity = 0;
         const stopPedal = false;
         const promises = [];
-        channel.scheduledNotes.forEach((scheduledNotes) => {
-            const activeNote = this.getActiveChannelNotes(scheduledNotes);
+        channel.scheduledNotes.forEach((noteList) => {
+            const activeNote = this.getActiveNote(noteList, now);
             if (activeNote) {
                 const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
                 promises.push(notePromise);
@@ -1240,10 +1355,10 @@ export class Midy {
                 switch (data[3]) {
                     // case 1:
                     //   // TODO
-                    //   return this.handleChannelPressure();
+                    //   return this.setChannelPressure();
                     // case 3:
                     //   // TODO
-                    //   return this.handleControlChange();
+                    //   return this.setControlChange();
                     default:
                         console.warn(`Unsupported Exclusive Message ${data}`);
                 }
@@ -1262,20 +1377,25 @@ export class Midy {
         }
     }
     handleMasterVolumeSysEx(data) {
-        const volume = (data[5] * 128 + data[4] - 8192) / 8192;
+        const volume = (data[5] * 128 + data[4]) / 16383;
         this.handleMasterVolume(volume);
     }
     handleMasterVolume(volume) {
-        const now = this.audioContext.currentTime;
-        this.masterGain.gain.cancelScheduledValues(now);
-        this.masterGain.gain.setValueAtTime(volume * volume, now);
+        if (volume < 0 && 1 < volume) {
+            console.error("Master Volume is out of range");
+        }
+        else {
+            const now = this.audioContext.currentTime;
+            this.masterGain.gain.cancelScheduledValues(now);
+            this.masterGain.gain.setValueAtTime(volume * volume, now);
+        }
     }
     handleMasterFineTuningSysEx(data) {
         const fineTuning = (data[5] * 128 + data[4] - 8192) / 8192;
         this.handleMasterFineTuning(fineTuning);
     }
     handleMasterFineTuning(fineTuning) {
-        if (fineTuning < 0 && 1 < fineTuning) {
+        if (fineTuning < -1 && 1 < fineTuning) {
             console.error("Master Fine Tuning value is out of range");
         }
         else {
@@ -1362,3 +1482,16 @@ Object.defineProperty(Midy, "effectSettings", {
         pitchBendRange: 2,
     }
 });
+Object.defineProperty(Midy, "controllerDestinationSettings", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: {
+        pitchControl: 0,
+        filterCutoffControl: 0,
+        amplitudeControl: 1,
+        lfoPitchDepth: 0,
+        lfoFilterDepth: 0,
+        lfoAmplitudeDepth: 0,
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",