@marmooo/midy 0.0.8 → 0.0.9

package/esm/midy.d.ts

@@ -40,7 +40,14 @@ export class Midy {
         lfoFilterDepth: number;
         lfoAmplitudeDepth: number;
     };
-    constructor(audioContext: any);
+    constructor(audioContext: any, options?: {
+        reverbAlgorithm: (audioContext: any) => {
+            input: any;
+            output: any;
+            dryGain: any;
+            wetGain: any;
+        };
+    });
     ticksPerBeat: number;
     totalTime: number;
     reverbFactor: number;
@@ -63,69 +70,25 @@ export class Midy {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    audioContext: any;
-    masterGain: any;
-    channels: {
-        scheduledNotes: Map<any, any>;
-        sostenutoNotes: Map<any, any>;
-        polyphonicKeyPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        channelPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        gainL: any;
-        gainR: any;
-        reverbEffect: {
-            convolverNode: any;
+    defaultOptions: {
+        reverbAlgorithm: (audioContext: any) => {
+            input: any;
+            output: any;
             dryGain: any;
             wetGain: any;
         };
-        chorusEffect: {
-            lfo: any;
-            lfoGain: any;
-            delayNodes: any[];
-            chorusGains: any[];
+    };
+    audioContext: any;
+    options: {
+        reverbAlgorithm: (audioContext: any) => {
+            input: any;
+            output: any;
+            dryGain: any;
+            wetGain: 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;
-        vibratoRate: number;
-        vibratoDepth: number;
-        vibratoDelay: number;
-        bank: number;
-        bankMSB: number;
-        bankLSB: number;
-        dataMSB: number;
-        dataLSB: number;
-        program: number;
-        pitchBend: number;
-        fineTuning: number;
-        coarseTuning: number;
-        modulationDepthRange: number;
-    }[];
+    };
+    masterGain: any;
+    channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -133,8 +96,10 @@ export class Midy {
     setChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
+        merger: any;
         reverbEffect: {
-            convolverNode: any;
+            input: any;
+            output: any;
             dryGain: any;
             wetGain: any;
         };
@@ -143,69 +108,10 @@ export class Midy {
             lfoGain: any;
             delayNodes: any[];
             chorusGains: any[];
+            output: any;
         };
     };
-    createChannels(audioContext: any): {
-        scheduledNotes: Map<any, any>;
-        sostenutoNotes: Map<any, any>;
-        polyphonicKeyPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        channelPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        gainL: any;
-        gainR: 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;
-        vibratoRate: number;
-        vibratoDepth: number;
-        vibratoDelay: number;
-        bank: number;
-        bankMSB: number;
-        bankLSB: number;
-        dataMSB: number;
-        dataLSB: number;
-        program: number;
-        pitchBend: number;
-        fineTuning: number;
-        coarseTuning: number;
-        modulationDepthRange: number;
-    }[];
+    createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
     createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
     convertToFloat32Array(uint8Array: any): Float32Array;
@@ -228,8 +134,18 @@ export class Midy {
     currentTime(): number;
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
-    createReverbEffect(audioContext: any, options?: {}): {
+    createConvolutionReverb(audioContext: any, options?: {}): {
+        input: any;
+        output: any;
+        dryGain: any;
+        wetGain: any;
         convolverNode: any;
+    };
+    createCombFilter(audioContext: any, input: any, delay: any, feedback: any): any;
+    createAllpassFilter(audioContext: any, input: any, delay: any, feedback: any): any;
+    createSchroederReverb(audioContext: any, options?: {}): {
+        input: any;
+        output: any;
         dryGain: any;
         wetGain: any;
     };
@@ -238,8 +154,9 @@ export class Midy {
         lfoGain: any;
         delayNodes: any[];
         chorusGains: any[];
+        output: any;
     };
-    connectNoteEffects(channel: any, gainNode: any): void;
+    connectEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAuBA;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiBC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MAqCC;IAED,sDA6BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,uDAcC;IAED,wHAqCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAwDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAqBC;IAED,sFAcC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAkEC;IAED,+CAEC;IAED,qCAcC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,0DASC;IAED,0DAIC;IAED,wDAWC;IAED,uDAGC;IAED,2DAGC;IAED,6DAGC;IAED,6DASC;IAED,kFAeC;IAED,2DAMC;IAED,gDAyBC;IAED,wCAEC;IAED,wCAEC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,wDAKC;IAED,6EAKC;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,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAxjDD;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"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IASF;;;;;;;OAOC;IAjFD,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;IA8ClB;;;;;;;MAKE;IAGA,kBAAgC;IAChC;;;;;;;MAAqD;IACrD,gBAA4C;IAE5C,gBAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;;;;MAkBC;IAED,yCAiBC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;;;MA4CC;IAED,gFAUC;IAED,mFAYC;IAID;;;;;MAuCC;IAED;;;;;;MAoCC;IAED,kDAuBC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,uDAcC;IAED,wHAqCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAiDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAqBC;IAED,sFAcC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAkEC;IAED,+CAEC;IAED,qCAcC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,0DASC;IAED,0DAIC;IAED,wDAWC;IAED,uDAGC;IAED,2DAGC;IAED,6DAGC;IAED,6DASC;IAED,kFAeC;IAED,2DAMC;IAED,gDAyBC;IAED,wCAEC;IAED,wCAEC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,wDAKC;IAED,6EAKC;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,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA5nDD;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/esm/midy.js

@@ -51,7 +51,7 @@ class Note {
     }
 }
 export class Midy {
-    constructor(audioContext) {
+    constructor(audioContext, options = this.defaultOptions) {
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -184,7 +184,19 @@ export class Midy {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "defaultOptions", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                reverbAlgorithm: (audioContext) => {
+                    // return this.createConvolutionReverb(audioContext);
+                    return this.createSchroederReverb(audioContext);
+                },
+            }
+        });
         this.audioContext = audioContext;
+        this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
         this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
@@ -225,23 +237,18 @@ export class Midy {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(Midy.channelSettings.pan);
+        const { gainLeft, gainRight } = this.panToGain(this.constructor.channelSettings.pan);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
         gainL.connect(merger, 0, 0);
         gainR.connect(merger, 0, 1);
-        merger.connect(this.masterGain);
-        const reverbEffect = this.createReverbEffect(audioContext);
+        const reverbEffect = this.options.reverbAlgorithm(audioContext);
         const chorusEffect = this.createChorusEffect(audioContext);
-        chorusEffect.lfo.start();
-        reverbEffect.dryGain.connect(gainL);
-        reverbEffect.dryGain.connect(gainR);
-        reverbEffect.wetGain.connect(gainL);
-        reverbEffect.wetGain.connect(gainR);
         return {
             gainL,
             gainR,
+            merger,
             reverbEffect,
             chorusEffect,
         };
@@ -249,16 +256,16 @@ export class Midy {
     createChannels(audioContext) {
         const channels = Array.from({ length: 16 }, () => {
             return {
-                ...Midy.channelSettings,
-                ...Midy.effectSettings,
+                ...this.constructor.channelSettings,
+                ...this.constructor.effectSettings,
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
                 polyphonicKeyPressure: {
-                    ...Midy.controllerDestinationSettings,
+                    ...this.constructor.controllerDestinationSettings,
                 },
                 channelPressure: {
-                    ...Midy.controllerDestinationSettings,
+                    ...this.constructor.controllerDestinationSettings,
                 },
             };
         });
@@ -589,8 +596,12 @@ export class Midy {
         }
         return noteList[0];
     }
-    createReverbEffect(audioContext, options = {}) {
+    createConvolutionReverb(audioContext, options = {}) {
         const { decay = 0.8, preDecay = 0, } = options;
+        const input = new GainNode(audioContext);
+        const output = new GainNode(audioContext);
+        const dryGain = new GainNode(audioContext);
+        const wetGain = new GainNode(audioContext);
         const sampleRate = audioContext.sampleRate;
         const length = sampleRate * decay;
         const impulse = new AudioBuffer({
@@ -604,27 +615,82 @@ export class Midy {
             for (let i = 0; i < preDecayLength; i++) {
                 channelData[i] = Math.random() * 2 - 1;
             }
+            const attenuationFactor = 1 / (sampleRate * decay);
             for (let i = preDecayLength; i < length; i++) {
-                const attenuation = Math.exp(-(i - preDecayLength) / sampleRate / decay);
+                const attenuation = Math.exp(-(i - preDecayLength) * attenuationFactor);
                 channelData[i] = (Math.random() * 2 - 1) * attenuation;
             }
         }
         const convolverNode = new ConvolverNode(audioContext, {
             buffer: impulse,
         });
-        const dryGain = new GainNode(audioContext);
-        const wetGain = new GainNode(audioContext);
+        input.connect(convolverNode);
         convolverNode.connect(wetGain);
+        wetGain.connect(output);
+        dryGain.connect(output);
         return {
-            convolverNode,
+            input,
+            output,
             dryGain,
             wetGain,
+            convolverNode,
         };
     }
+    createCombFilter(audioContext, input, delay, feedback) {
+        const delayNode = new DelayNode(audioContext, {
+            maxDelayTime: delay,
+            delayTime: delay,
+        });
+        const feedbackGain = new GainNode(audioContext, { gain: feedback });
+        input.connect(delayNode);
+        delayNode.connect(feedbackGain);
+        feedbackGain.connect(delayNode);
+        return delayNode;
+    }
+    createAllpassFilter(audioContext, input, delay, feedback) {
+        const delayNode = new DelayNode(audioContext, {
+            maxDelayTime: delay,
+            delayTime: delay,
+        });
+        const feedbackGain = new GainNode(audioContext, { gain: feedback });
+        const passGain = new GainNode(audioContext, { gain: 1 - feedback });
+        input.connect(delayNode);
+        delayNode.connect(feedbackGain);
+        feedbackGain.connect(delayNode);
+        delayNode.connect(passGain);
+        return passGain;
+    }
+    // https://hajim.rochester.edu/ece/sites/zduan/teaching/ece472/reading/Schroeder_1962.pdf
+    //   M.R.Schroeder, "Natural Sounding Artificial Reverberation", J.Audio Eng. Soc., vol.10, p.219, 1962
+    createSchroederReverb(audioContext, options = {}) {
+        const { combDelays = [0.31, 0.34, 0.37, 0.40], combFeedbacks = [0.86, 0.87, 0.88, 0.89], allpassDelays = [0.02, 0.05], allpassFeedbacks = [0.7, 0.7], mix = 0.5, } = options;
+        const input = new GainNode(audioContext);
+        const output = new GainNode(audioContext);
+        const mergerGain = new GainNode(audioContext, {
+            gain: 1 / (combDelays.length * 2),
+        });
+        const dryGain = new GainNode(audioContext, { gain: 1 - mix });
+        const wetGain = new GainNode(audioContext, { gain: mix });
+        for (let i = 0; i < combDelays.length; i++) {
+            const comb = this.createCombFilter(audioContext, input, combDelays[i], combFeedbacks[i]);
+            comb.connect(mergerGain);
+        }
+        const allpasses = [];
+        for (let i = 0; i < allpassDelays.length; i++) {
+            const allpass = this.createAllpassFilter(audioContext, (i === 0) ? mergerGain : allpasses.at(-1), allpassDelays[i], allpassFeedbacks[i]);
+            allpasses.push(allpass);
+        }
+        allpasses.at(-1).connect(wetGain);
+        input.connect(dryGain);
+        dryGain.connect(output);
+        wetGain.connect(output);
+        return { input, output, dryGain, wetGain };
+    }
     createChorusEffect(audioContext, options = {}) {
         const { chorusCount = 2, chorusRate = 0.6, chorusDepth = 0.15, delay = 0.01, variance = delay * 0.1, } = options;
         const lfo = new OscillatorNode(audioContext, { frequency: chorusRate });
         const lfoGain = new GainNode(audioContext, { gain: chorusDepth });
+        const output = new GainNode(audioContext);
         const chorusGains = [];
         const delayNodes = [];
         const baseGain = 1 / chorusCount;
@@ -634,50 +700,47 @@ export class Midy {
             const delayNode = new DelayNode(audioContext, {
                 maxDelayTime: delayTime,
             });
-            delayNodes.push(delayNode);
             const chorusGain = new GainNode(audioContext, { gain: baseGain });
+            delayNodes.push(delayNode);
             chorusGains.push(chorusGain);
-            lfo.connect(lfoGain);
             lfoGain.connect(delayNode.delayTime);
             delayNode.connect(chorusGain);
+            chorusGain.connect(output);
         }
+        lfo.connect(lfoGain);
+        lfo.start();
         return {
             lfo,
             lfoGain,
             delayNodes,
             chorusGains,
+            output,
         };
     }
-    connectNoteEffects(channel, gainNode) {
+    connectEffects(channel, gainNode) {
+        gainNode.connect(channel.merger);
         if (channel.reverb === 0) {
             if (channel.chorus === 0) { // no effect
-                gainNode.connect(channel.gainL);
-                gainNode.connect(channel.gainR);
+                channel.merger.connect(this.masterGain);
             }
             else { // chorus
                 channel.chorusEffect.delayNodes.forEach((delayNode) => {
-                    gainNode.connect(delayNode);
-                });
-                channel.chorusEffect.chorusGains.forEach((chorusGain) => {
-                    chorusGain.connect(channel.gainL);
-                    chorusGain.connect(channel.gainR);
+                    channel.merger.connect(delayNode);
                 });
+                channel.chorusEffect.output.connect(this.masterGain);
             }
         }
         else {
             if (channel.chorus === 0) { // reverb
-                gainNode.connect(channel.reverbEffect.convolverNode);
-                gainNode.connect(channel.reverbEffect.dryGain);
+                channel.merger.connect(channel.reverbEffect.input);
+                channel.reverbEffect.output.connect(this.masterGain);
             }
             else { // reverb + chorus
-                gainNode.connect(channel.reverbEffect.convolverNode);
-                gainNode.connect(channel.reverbEffect.dryGain);
                 channel.chorusEffect.delayNodes.forEach((delayNode) => {
-                    gainNode.connect(delayNode);
-                });
-                channel.chorusEffect.chorusGains.forEach((chorusGain) => {
-                    chorusGain.connect(channel.reverbEffect.convolverNode);
+                    channel.merger.connect(delayNode);
                 });
+                channel.merger.connect(channel.reverbEffect.input);
+                channel.reverbEffect.output.connect(this.masterGain);
             }
         }
     }
@@ -817,7 +880,7 @@ export class Midy {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectNoteEffects(channel, note.gainNode);
+        this.connectEffects(channel, note.gainNode);
         if (channel.sostenutoPedal) {
             channel.sostenutoNotes.set(noteNumber, note);
         }
@@ -841,46 +904,48 @@ export class Midy {
             return;
         if (!channel.scheduledNotes.has(noteNumber))
             return;
-        const targetNotes = channel.scheduledNotes.get(noteNumber);
-        for (let i = 0; i < targetNotes.length; i++) {
-            const targetNote = targetNotes[i];
-            if (!targetNote)
+        const scheduledNotes = channel.scheduledNotes.get(noteNumber);
+        for (let i = 0; i < scheduledNotes.length; i++) {
+            const note = scheduledNotes[i];
+            if (!note)
                 continue;
-            if (targetNote.ending)
+            if (note.ending)
                 continue;
-            const { bufferSource, filterNode, gainNode, modLFO, modLFOGain, vibLFO, vibLFOGain, instrumentKey, } = targetNote;
             const velocityRate = (velocity + 127) / 127;
-            const volEndTime = stopTime + instrumentKey.volRelease * velocityRate;
-            gainNode.gain.cancelScheduledValues(stopTime);
-            gainNode.gain.linearRampToValueAtTime(0, volEndTime);
+            const volEndTime = stopTime +
+                note.instrumentKey.volRelease * velocityRate;
+            note.gainNode.gain
+                .cancelScheduledValues(stopTime)
+                .linearRampToValueAtTime(0, volEndTime);
             const maxFreq = this.audioContext.sampleRate / 2;
-            const baseFreq = this.centToHz(instrumentKey.initialFilterFc);
+            const baseFreq = this.centToHz(note.instrumentKey.initialFilterFc);
             const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-            const modEndTime = stopTime + instrumentKey.modRelease * velocityRate;
-            filterNode.frequency
+            const modEndTime = stopTime +
+                note.instrumentKey.modRelease * velocityRate;
+            note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(adjustedBaseFreq, modEndTime);
-            targetNote.ending = true;
+            note.ending = true;
             this.scheduleTask(() => {
-                bufferSource.loop = false;
+                note.bufferSource.loop = false;
             }, stopTime);
             return new Promise((resolve) => {
-                bufferSource.onended = () => {
-                    targetNotes[i] = null;
-                    bufferSource.disconnect(0);
-                    filterNode.disconnect(0);
-                    gainNode.disconnect(0);
-                    if (modLFOGain)
-                        modLFOGain.disconnect(0);
-                    if (vibLFOGain)
-                        vibLFOGain.disconnect(0);
-                    if (modLFO)
-                        modLFO.stop();
-                    if (vibLFO)
-                        vibLFO.stop();
+                note.bufferSource.onended = () => {
+                    scheduledNotes[i] = null;
+                    note.bufferSource.disconnect();
+                    note.filterNode.disconnect();
+                    note.gainNode.disconnect();
+                    if (note.modLFOGain)
+                        note.modLFOGain.disconnect();
+                    if (note.vibLFOGain)
+                        note.vibLFOGain.disconnect();
+                    if (note.modLFO)
+                        note.modLFO.stop();
+                    if (note.vibLFO)
+                        note.vibLFO.stop();
                     resolve();
                 };
-                bufferSource.stop(volEndTime);
+                note.bufferSource.stop(volEndTime);
             });
         }
     }

package/package.json

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

package/script/midy-GM1.d.ts

@@ -39,27 +39,7 @@ export class MidyGM1 {
     notePromises: any[];
     audioContext: any;
     masterGain: any;
-    channels: {
-        scheduledNotes: Map<any, any>;
-        gainL: any;
-        gainR: any;
-        expression: number;
-        modulation: number;
-        sustainPedal: boolean;
-        rpnMSB: number;
-        rpnLSB: number;
-        pitchBendRange: number;
-        volume: number;
-        pan: number;
-        bank: number;
-        dataMSB: number;
-        dataLSB: number;
-        program: number;
-        pitchBend: number;
-        fineTuning: number;
-        coarseTuning: number;
-        modulationDepthRange: number;
-    }[];
+    channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -67,28 +47,11 @@ export class MidyGM1 {
     setChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
+        merger: any;
+        reverbEffect: any;
+        chorusEffect: any;
     };
-    createChannels(audioContext: any): {
-        scheduledNotes: Map<any, any>;
-        gainL: any;
-        gainR: any;
-        expression: number;
-        modulation: number;
-        sustainPedal: boolean;
-        rpnMSB: number;
-        rpnLSB: number;
-        pitchBendRange: number;
-        volume: number;
-        pan: number;
-        bank: number;
-        dataMSB: number;
-        dataLSB: number;
-        program: number;
-        pitchBend: number;
-        fineTuning: number;
-        coarseTuning: number;
-        modulationDepthRange: number;
-    }[];
+    createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
     createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
     convertToFloat32Array(uint8Array: any): Float32Array;
@@ -111,7 +74,7 @@ export class MidyGM1 {
     currentTime(): number;
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
-    connectNoteEffects(channel: any, gainNode: any): void;
+    connectEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA9CD,qBAAmB;IACnB,kBAAc;IACd,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;IAyBhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;MAYC;IAED;;;;;;;;;;;;;;;;;;;;QAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,sDAGC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHA6BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIAmDC;IAED,0FAGC;IAED,kEAeC;IAED,wFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,mFA+BC;IAED,qCAcC;IAED,yDAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAtjCD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA9CD,qBAAmB;IACnB,kBAAc;IACd,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;IAyBhB,kBAAgC;IAChC,gBAA4C;IAE5C,gBAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;MAkBC;IAED,yCAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,kDAGC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHA6BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIA8CC;IAED,0FAGC;IAED,kEAeC;IAED,wFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,mFA+BC;IAED,qCAcC;IAED,yDAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAvjCD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}