@marmooo/midy 0.0.4 → 0.0.5

package/script/midy-GM2.d.ts

@@ -6,9 +6,6 @@ export class MidyGM2 {
         portamentoTime: number;
         reverb: number;
         chorus: number;
-        vibratoRate: number;
-        vibratoDepth: number;
-        vibratoDelay: number;
         bank: number;
         bankMSB: number;
         bankLSB: number;
@@ -65,7 +62,56 @@ export class MidyGM2 {
     notePromises: any[];
     audioContext: any;
     masterGain: any;
-    channels: any[];
+    channels: {
+        scheduledNotes: Map<any, any>;
+        sostenutoNotes: Map<any, any>;
+        channelPressure: {
+            pitchControl: number;
+            filterCutoffControl: number;
+            amplitudeControl: number;
+            lfoPitchDepth: number;
+            lfoFilterDepth: number;
+            lfoAmplitudeDepth: number;
+        };
+        gainNode: any;
+        pannerNode: any;
+        reverbEffect: {
+            convolverNode: any;
+            dryGain: any;
+            wetGain: any;
+        };
+        chorusEffect: {
+            lfo: any;
+            lfoGain: any;
+            delayNodes: any[];
+            chorusGains: any[];
+        };
+        expression: number;
+        modulation: number;
+        sustainPedal: boolean;
+        portamento: boolean;
+        sostenutoPedal: boolean;
+        softPedal: number;
+        rpnMSB: number;
+        rpnLSB: number;
+        pitchBendRange: number;
+        currentBufferSource: null;
+        volume: number;
+        pan: number;
+        portamentoTime: number;
+        reverb: number;
+        chorus: number;
+        bank: number;
+        bankMSB: number;
+        bankLSB: number;
+        dataMSB: number;
+        dataLSB: number;
+        program: number;
+        pitchBend: number;
+        fineTuning: number;
+        coarseTuning: number;
+        modulationDepthRange: number;
+    }[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -73,9 +119,31 @@ export class MidyGM2 {
     setChannelAudioNodes(audioContext: any): {
         gainNode: any;
         pannerNode: any;
-        modulationEffect: {
+        reverbEffect: {
+            convolverNode: any;
+            dryGain: any;
+            wetGain: any;
+        };
+        chorusEffect: {
             lfo: any;
+            lfoGain: any;
+            delayNodes: any[];
+            chorusGains: any[];
         };
+    };
+    createChannels(audioContext: any): {
+        scheduledNotes: Map<any, any>;
+        sostenutoNotes: Map<any, any>;
+        channelPressure: {
+            pitchControl: number;
+            filterCutoffControl: number;
+            amplitudeControl: number;
+            lfoPitchDepth: number;
+            lfoFilterDepth: number;
+            lfoAmplitudeDepth: number;
+        };
+        gainNode: any;
+        pannerNode: any;
         reverbEffect: {
             convolverNode: any;
             dryGain: any;
@@ -87,10 +155,34 @@ export class MidyGM2 {
             delayNodes: any[];
             chorusGains: any[];
         };
-    };
-    createChannels(audioContext: any): any[];
-    createNoteBuffer(noteInfo: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(noteInfo: any, isSF3: any): Promise<any>;
+        expression: number;
+        modulation: number;
+        sustainPedal: boolean;
+        portamento: boolean;
+        sostenutoPedal: boolean;
+        softPedal: number;
+        rpnMSB: number;
+        rpnLSB: number;
+        pitchBendRange: number;
+        currentBufferSource: null;
+        volume: number;
+        pan: number;
+        portamentoTime: number;
+        reverb: number;
+        chorus: number;
+        bank: number;
+        bankMSB: number;
+        bankLSB: number;
+        dataMSB: number;
+        dataLSB: number;
+        program: number;
+        pitchBend: number;
+        fineTuning: number;
+        coarseTuning: number;
+        modulationDepthRange: number;
+    }[];
+    createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
+    createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
     convertToFloat32Array(uint8Array: any): Float32Array;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
@@ -109,11 +201,8 @@ export class MidyGM2 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    getActiveNotes(channel: any): Map<any, any>;
-    getActiveChannelNotes(scheduledNotes: any): any;
-    createModulationEffect(audioContext: any): {
-        lfo: any;
-    };
+    getActiveNotes(channel: any, time: any): Map<any, any>;
+    getActiveNote(noteList: any, time: any): any;
     createReverbEffect(audioContext: any, options?: {}): {
         convolverNode: any;
         dryGain: any;
@@ -129,13 +218,11 @@ export class MidyGM2 {
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;
-    calcPlaybackRate(noteInfo: any, noteNumber: any, semitoneOffset: any): number;
-    createNoteAudioChain(channel: any, noteInfo: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<{
-        bufferSource: any;
-        gainNode: any;
-        filterNode: any;
-        lfoGain: any;
-    }>;
+    calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
+    setVolumeEnvelope(channel: any, note: any): void;
+    setFilterEnvelope(channel: any, note: any): void;
+    startModulation(channel: any, note: any, time: any): void;
+    createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     calcBank(channel: any, channelNumber: any): any;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
@@ -187,4 +274,19 @@ export class MidyGM2 {
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;
 }
+declare class Note {
+    constructor(noteNumber: any, velocity: any, startTime: any, instrumentKey: any);
+    bufferSource: any;
+    gainNode: any;
+    filterNode: any;
+    modLFO: any;
+    modLFOGain: any;
+    vibLFO: any;
+    vibLFOGain: any;
+    noteNumber: any;
+    velocity: any;
+    startTime: any;
+    instrumentKey: any;
+}
+export {};
 //# sourceMappingURL=midy-GM2.d.ts.map

package/script/midy-GM2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAMA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAzED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA+ChB,kBAAgC;IAChC,gBAA4C;IAE5C,gBAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;;;;MAuBC;IAED,yCAcC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EAkDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA2GC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;MAOC;IAED;;;;MAoCC;IAED;;;;;MA2CC;IAED,sDA2BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,8EAEC;IAED;;;;;OAqFC;IAED,gDAQC;IAED,kGAgDC;IAED,0EAGC;IAED,sIA6CC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,0DAiBC;IAED,mFAuDC;IAED,+CAEC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,+CAEC;IAED,sCAKC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAUC;IAED,uDAGC;IAED,gDAEC;IAED,gDAEC;IAED,+DAuBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,sCAQC;IAED,6CAGC;IAED,8CAMC;IAED,+CAGC;IAED,kDAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;MAiBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAtED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA4ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAoBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAcC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAkDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA2GC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MA2CC;IAED,sDA2BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAmBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHAiCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAoDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,0DAiBC;IAED,mFAuDC;IAED,+CAEC;IAED,yDAiBC;IAED,iEAEC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,+CAEC;IAED,sCAKC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAUC;IAED,uDAGC;IAED,gDAEC;IAED,gDAEC;IAED,+DAuBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,sCAQC;IAED,6CAGC;IAED,8CAMC;IAED,+CAGC;IAED,kDAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAv3CD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/script/midy-GM2.js

@@ -2,7 +2,57 @@
 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.1/+esm.js");
+const _esm_js_2 = require("./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;
+    }
+}
 class MidyGM2 {
     constructor(audioContext) {
         Object.defineProperty(this, "ticksPerBeat", {
@@ -184,10 +234,8 @@ class MidyGM2 {
         const pannerNode = new StereoPannerNode(audioContext, {
             pan: MidyGM2.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);
@@ -196,7 +244,6 @@ class MidyGM2 {
         return {
             gainNode,
             pannerNode,
-            modulationEffect,
             reverbEffect,
             chorusEffect,
         };
@@ -204,23 +251,23 @@ class MidyGM2 {
     createChannels(audioContext) {
         const channels = Array.from({ length: 16 }, () => {
             return {
-                ...Midy.channelSettings,
-                ...Midy.effectSettings,
+                ...MidyGM2.channelSettings,
+                ...MidyGM2.effectSettings,
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
                 channelPressure: {
-                    ...Midy.controllerDestinationSettings,
+                    ...MidyGM2.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);
@@ -229,26 +276,27 @@ class MidyGM2 {
             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;
     }
@@ -527,30 +575,26 @@ class MidyGM2 {
         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;
@@ -660,77 +704,93 @@ class MidyGM2 {
         const tuning = masterTuning + channelTuning;
         return channel.pitchBend * channel.pitchBendRange + tuning;
     }
-    calcPlaybackRate(noteInfo, noteNumber, semitoneOffset) {
-        return noteInfo.playbackRate(noteNumber) * Math.pow(2, semitoneOffset / 12);
+    calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset) {
+        return instrumentKey.playbackRate(noteNumber) *
+            Math.pow(2, semitoneOffset / 12);
     }
-    async createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3) {
-        const bufferSource = await this.createNoteBufferNode(noteInfo, isSF3);
-        const semitoneOffset = this.calcSemitoneOffset(channel);
-        bufferSource.playbackRate.value = this.calcPlaybackRate(noteInfo, noteNumber, semitoneOffset);
-        // 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);
+    }
+    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);
         }
-        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, lfoGain };
+        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) {
@@ -749,36 +809,20 @@ class MidyGM2 {
             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, lfoGain } = 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) {
@@ -800,15 +844,15 @@ class MidyGM2 {
                 continue;
             if (targetNote.ending)
                 continue;
-            const { bufferSource, filterNode, gainNode, lfoGain, noteInfo } = targetNote;
+            const { bufferSource, filterNode, gainNode, modLFO, modLFOGain, 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);
@@ -822,8 +866,10 @@ class MidyGM2 {
                     bufferSource.disconnect(0);
                     filterNode.disconnect(0);
                     gainNode.disconnect(0);
-                    if (lfoGain)
-                        lfoGain.disconnect(0);
+                    if (modLFOGain)
+                        modLFOGain.disconnect(0);
+                    if (modLFO)
+                        modLFO.stop();
                     resolve();
                 };
                 bufferSource.stop(volEndTime);
@@ -893,7 +939,7 @@ class MidyGM2 {
         const channel = this.channels[channelNumber];
         pressure /= 64;
         channel.channelPressure = pressure;
-        const activeNotes = this.getActiveNotes(channel);
+        const activeNotes = this.getActiveNotes(channel, now);
         if (channel.channelPressure.amplitudeControl !== 1) {
             activeNotes.forEach((activeNote) => {
                 const gain = activeNote.gainNode.gain.value;
@@ -912,10 +958,10 @@ class MidyGM2 {
         const channel = this.channels[channelNumber];
         channel.pitchBend = (pitchBend - 8192) / 8192;
         const semitoneOffset = this.calcSemitoneOffset(channel);
-        const activeNotes = this.getActiveNotes(channel);
+        const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
-            const { bufferSource, noteInfo, noteNumber } = activeNote;
-            const playbackRate = calcPlaybackRate(noteInfo, noteNumber, semitoneOffset);
+            const { bufferSource, instrumentKey, noteNumber } = activeNote;
+            const playbackRate = calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
             bufferSource.playbackRate
                 .cancelScheduledValues(now)
                 .setValueAtTime(playbackRate * pressure, now);
@@ -979,9 +1025,20 @@ class MidyGM2 {
         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;
@@ -1087,8 +1144,8 @@ class MidyGM2 {
         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);
@@ -1105,8 +1162,8 @@ class MidyGM2 {
         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);
@@ -1288,9 +1345,6 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         portamentoTime: 0,
         reverb: 0,
         chorus: 0,
-        vibratoRate: 5,
-        vibratoDepth: 0.5,
-        vibratoDelay: 2.5,
         bank: 121 * 128,
         bankMSB: 121,
         bankLSB: 0,