@marmooo/midy 0.0.8 → 0.1.0

package/script/midy-GM2.js

@@ -54,7 +54,7 @@ class Note {
     }
 }
 class MidyGM2 {
-    constructor(audioContext) {
+    constructor(audioContext, options = this.defaultOptions) {
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -67,12 +67,6 @@ class MidyGM2 {
             writable: true,
             value: 0
         });
-        Object.defineProperty(this, "reverbFactor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0.1
-        });
         Object.defineProperty(this, "masterFineTuning", {
             enumerable: true,
             configurable: true,
@@ -85,6 +79,26 @@ class MidyGM2 {
             writable: true,
             value: 0
         }); // cb
+        Object.defineProperty(this, "reverb", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                time: this.getReverbTime(64),
+                feedback: 0.2,
+            }
+        });
+        Object.defineProperty(this, "chorus", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                modRate: 3 * 0.122,
+                modDepth: (3 + 1) / 3.2,
+                feedback: 8 * 0.763,
+                sendToReverb: 0 * 0.787,
+            }
+        });
         Object.defineProperty(this, "mono", {
             enumerable: true,
             configurable: true,
@@ -187,7 +201,30 @@ class MidyGM2 {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "defaultOptions", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                reverbAlgorithm: (audioContext) => {
+                    const { time: rt60, feedback } = this.reverb;
+                    // const delay = this.calcDelay(rt60, feedback);
+                    // const impulse = this.createConvolutionReverbImpulse(
+                    //   audioContext,
+                    //   rt60,
+                    //   delay,
+                    // );
+                    // return this.createConvolutionReverb(audioContext, impulse);
+                    const combFeedbacks = this.generateDistributedArray(feedback, 4);
+                    const combDelays = combFeedbacks.map((feedback) => this.calcDelay(rt60, feedback));
+                    const allpassFeedbacks = this.generateDistributedArray(feedback, 4);
+                    const allpassDelays = allpassFeedbacks.map((feedback) => this.calcDelay(rt60, feedback));
+                    return this.createSchroederReverb(audioContext, combFeedbacks, combDelays, allpassFeedbacks, allpassDelays);
+                },
+            }
+        });
         this.audioContext = audioContext;
+        this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
         this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
@@ -228,23 +265,18 @@ class MidyGM2 {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(MidyGM2.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,
         };
@@ -252,13 +284,13 @@ class MidyGM2 {
     createChannels(audioContext) {
         const channels = Array.from({ length: 16 }, () => {
             return {
-                ...MidyGM2.channelSettings,
-                ...MidyGM2.effectSettings,
+                ...this.constructor.channelSettings,
+                ...this.constructor.effectSettings,
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
                 channelPressure: {
-                    ...MidyGM2.controllerDestinationSettings,
+                    ...this.constructor.controllerDestinationSettings,
                 },
             };
         });
@@ -586,8 +618,7 @@ class MidyGM2 {
         }
         return noteList[0];
     }
-    createReverbEffect(audioContext, options = {}) {
-        const { decay = 0.8, preDecay = 0, } = options;
+    createConvolutionReverbImpulse(audioContext, decay, preDecay) {
         const sampleRate = audioContext.sampleRate;
         const length = sampleRate * decay;
         const impulse = new AudioBuffer({
@@ -601,27 +632,85 @@ class MidyGM2 {
             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;
             }
         }
+        return impulse;
+    }
+    createConvolutionReverb(audioContext, impulse) {
+        const output = new GainNode(audioContext);
         const convolverNode = new ConvolverNode(audioContext, {
             buffer: impulse,
         });
-        const dryGain = new GainNode(audioContext);
-        const wetGain = new GainNode(audioContext);
-        convolverNode.connect(wetGain);
+        convolverNode.connect(output);
         return {
+            input: convolverNode,
+            output,
             convolverNode,
-            dryGain,
-            wetGain,
         };
     }
+    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;
+    }
+    generateDistributedArray(center, count, varianceRatio = 0.1, randomness = 0.05) {
+        const variance = center * varianceRatio;
+        const array = new Array(count);
+        for (let i = 0; i < count; i++) {
+            const fraction = i / (count - 1 || 1);
+            const value = center - variance + fraction * 2 * variance;
+            array[i] = value * (1 - (Math.random() * 2 - 1) * randomness);
+        }
+        return array;
+    }
+    // https://hajim.rochester.edu/ece/sites/zduan/teaching/ece472/reading/Schroeder_1962.pdf
+    //   M.R.Schroeder, "Natural Sounding Artificial Reverberation", J.Audio Eng. Soc., vol.10, p.219, 1962
+    createSchroederReverb(audioContext, combDelays, combFeedbacks, allpassDelays, allpassFeedbacks) {
+        const input = new GainNode(audioContext);
+        const output = new GainNode(audioContext);
+        const mergerGain = new GainNode(audioContext, {
+            gain: 1 / (combDelays.length * 2),
+        });
+        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(output);
+        return { input, output };
+    }
     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;
@@ -631,50 +720,45 @@ class MidyGM2 {
             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) {
-        if (channel.reverb === 0) {
-            if (channel.chorus === 0) { // no effect
-                gainNode.connect(channel.gainL);
-                gainNode.connect(channel.gainR);
-            }
-            else { // chorus
+    connectEffects(channel, gainNode) {
+        gainNode.connect(channel.merger);
+        channel.merger.connect(this.masterGain);
+        if (channel.reverbSendLevel === 0) {
+            if (channel.chorusSendLevel !== 0) { // 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);
+            if (channel.chorusSendLevel === 0) { // reverb
+                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);
             }
         }
     }
@@ -745,7 +829,7 @@ class MidyGM2 {
     startModulation(channel, note, time) {
         const { instrumentKey } = note;
         note.modLFOGain = new GainNode(this.audioContext, {
-            gain: this.cbToRatio(instrumentKey.modLfoToVolume) * channel.modulation,
+            gain: this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation),
         });
         note.modLFO = new OscillatorNode(this.audioContext, {
             frequency: this.centToHz(instrumentKey.freqModLFO),
@@ -797,7 +881,7 @@ class MidyGM2 {
         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);
         }
@@ -821,42 +905,48 @@ class MidyGM2 {
             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, 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 (modLFO)
-                        modLFO.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);
             });
         }
     }
@@ -1070,23 +1160,22 @@ class MidyGM2 {
             this.releaseSustainPedal(channelNumber, value);
         }
     }
+    // TODO
     setPortamento(channelNumber, value) {
         this.channels[channelNumber].portamento = value >= 64;
     }
-    setReverbSendLevel(channelNumber, reverb) {
+    setReverbSendLevel(channelNumber, reverbSendLevel) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const reverbEffect = channel.reverbEffect;
-        channel.reverb = reverb / 127 * this.reverbFactor;
-        reverbEffect.dryGain.gain.cancelScheduledValues(now);
-        reverbEffect.dryGain.gain.setValueAtTime(1 - channel.reverb, now);
-        reverbEffect.wetGain.gain.cancelScheduledValues(now);
-        reverbEffect.wetGain.gain.setValueAtTime(channel.reverb, now);
+        channel.reverbSendLevel = reverbSendLevel / 127;
+        reverbEffect.output.gain.cancelScheduledValues(now);
+        reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
     }
-    setChorusSendLevel(channelNumber, chorus) {
+    setChorusSendLevel(channelNumber, chorusSendLevel) {
         const channel = this.channels[channelNumber];
-        channel.chorus = chorus / 127;
-        channel.chorusEffect.lfoGain = channel.chorus;
+        channel.chorusSendLevel = chorusSendLevel / 127;
+        channel.chorusEffect.lfoGain = channel.chorusSendLevel;
     }
     setSostenutoPedal(channelNumber, value) {
         const isOn = value >= 64;
@@ -1282,11 +1371,11 @@ class MidyGM2 {
                         this.GM2SystemOn();
                         break;
                     default:
-                        console.warn(`Unsupported Exclusive Message ${data}`);
+                        console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
                 break;
             default:
-                console.warn(`Unsupported Exclusive Message ${data}`);
+                console.warn(`Unsupported Exclusive Message: ${data}`);
         }
     }
     GM1SystemOn() {
@@ -1317,9 +1406,10 @@ class MidyGM2 {
                         return this.handleMasterFineTuningSysEx(data);
                     case 4: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterCoarseTuningSysEx(data);
-                    // case 5: // TODO: Global Parameter Control
+                    case 5:
+                        return this.handleGlobalParameterControl(data);
                     default:
-                        console.warn(`Unsupported Exclusive Message ${data}`);
+                        console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
                 break;
             case 8:
@@ -1328,7 +1418,7 @@ class MidyGM2 {
                     //   // TODO
                     //   return this.handleScaleOctaveTuning1ByteFormat();
                     default:
-                        console.warn(`Unsupported Exclusive Message ${data}`);
+                        console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
                 break;
             case 9:
@@ -1340,7 +1430,7 @@ class MidyGM2 {
                     //   // TODO
                     //   return this.setControlChange();
                     default:
-                        console.warn(`Unsupported Exclusive Message ${data}`);
+                        console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
                 break;
             case 10:
@@ -1349,11 +1439,11 @@ class MidyGM2 {
                     //   // TODO
                     //   return this.handleKeyBasedInstrumentControl();
                     default:
-                        console.warn(`Unsupported Exclusive Message ${data}`);
+                        console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
                 break;
             default:
-                console.warn(`Unsupported Exclusive Message ${data}`);
+                console.warn(`Unsupported Exclusive Message: ${data}`);
         }
     }
     handleMasterVolumeSysEx(data) {
@@ -1394,8 +1484,124 @@ class MidyGM2 {
             this.masterCoarseTuning = coarseTuning - 64;
         }
     }
+    handleGlobalParameterControl(data) {
+        if (data[5] === 1) {
+            switch (data[6]) {
+                case 1:
+                    return this.handleReverbParameter(data);
+                case 2:
+                    return this.handleChorusParameter(data);
+                default:
+                    console.warn(`Unsupported Global Parameter Control Message: ${data}`);
+            }
+        }
+        else {
+            console.warn(`Unsupported Global Parameter Control Message: ${data}`);
+        }
+    }
+    handleReverbParameter(data) {
+        switch (data[7]) {
+            case 0:
+                return this.setReverbType(data[8]);
+            case 1:
+                return this.setReverbTime(data[8]);
+        }
+    }
+    setReverbType(type) {
+        this.reverb.time = this.getReverbTimeFromType(type);
+        this.reverb.feedback = (type === 8) ? 0.1 : 0.2;
+        const { audioContext, channels, options } = this;
+        for (let i = 0; i < channels.length; i++) {
+            channels[i].reverbEffect = options.reverbAlgorithm(audioContext);
+        }
+    }
+    getReverbTimeFromType(type) {
+        switch (type) {
+            case 0:
+                return this.getReverbTime(44);
+            case 1:
+                return this.getReverbTime(50);
+            case 2:
+                return this.getReverbTime(56);
+            case 3:
+                return this.getReverbTime(64);
+            case 4:
+                return this.getReverbTime(64);
+            case 8:
+                return this.getReverbTime(50);
+            default:
+                console.warn(`Unsupported Reverb Time: ${type}`);
+        }
+    }
+    setReverbTime(value) {
+        this.reverb.time = this.getReverbTime(value);
+        const { audioContext, channels, options } = this;
+        for (let i = 0; i < channels.length; i++) {
+            channels[i].reverbEffect = options.reverbAlgorithm(audioContext);
+        }
+    }
+    getReverbTime(value) {
+        return Math.pow(Math.E, (value - 40) * 0.025);
+    }
+    // mean free path equation
+    //   https://repository.dl.itc.u-tokyo.ac.jp/record/8550/files/A31912.pdf
+    //     江田和司, 拡散性制御に基づく室内音響設計に向けた音場解析に関する研究, 2015
+    //   V: room size (m^3)
+    //   S: room surface area (m^2)
+    //   meanFreePath = 4V / S (m)
+    // delay estimation using mean free path
+    //   t: degree Celsius, generally used 20
+    //   c: speed of sound = 331.5 + 0.61t = 331.5 * 0.61 * 20 = 343.7 (m/s)
+    //   delay = meanFreePath / c (s)
+    // feedback equation
+    //   RT60 means that the energy is reduced to Math.pow(10, -6).
+    //   Since energy is proportional to the square of the amplitude,
+    //   the amplitude is reduced to Math.pow(10, -3).
+    //   When this is done through n feedbacks,
+    //   Math.pow(feedback, n) = Math.pow(10, -3)
+    //   Math.pow(feedback, RT60 / delay) = Math.pow(10, -3)
+    //   RT60 / delay * Math.log10(feedback) = -3
+    //   RT60 = -3 * delay / Math.log10(feedback)
+    //   feedback = Math.pow(10, -3 * delay / RT60)
+    // delay estimation using ideal feedback
+    //   A suitable average sound absorption coefficient is 0.18-0.28.
+    //   Since the structure of the hall is complex,
+    //   It would be easier to determine the delay based on the ideal feedback.
+    //   delay = -RT60 * Math.log10(feedback) / 3
+    calcDelay(rt60, feedback) {
+        return -rt60 * Math.log10(feedback) / 3;
+    }
+    handleChorusParameter(data) {
+        switch (data[7]) {
+            case 0:
+                return this.setChorusType(data[8]);
+            case 1:
+                return this.setChorusModRate(data[8]);
+            case 2:
+                return this.setChorusModDepth(data[8]);
+            case 3:
+                return this.setChorusFeedback(data[8]);
+            case 4:
+                return this.setChorusSendToReverb(data[8]);
+        }
+    }
+    setChorusType(type) {
+        // TODO
+    }
+    setChorusModRate(value) {
+        // TODO
+    }
+    setChorusModDepth(value) {
+        // TODO
+    }
+    setChorusFeedback(value) {
+        // TODO
+    }
+    setChorusSendToReverb(value) {
+        // TODO
+    }
     handleExclusiveMessage(data) {
-        console.warn(`Unsupported Exclusive Message ${data}`);
+        console.warn(`Unsupported Exclusive Message: ${data}`);
     }
     handleSysEx(data) {
         switch (data[0]) {
@@ -1429,8 +1635,8 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         volume: 100 / 127,
         pan: 64,
         portamentoTime: 0,
-        reverb: 0,
-        chorus: 0,
+        reverbSendLevel: 0,
+        chorusSendLevel: 0,
         bank: 121 * 128,
         bankMSB: 121,
         bankLSB: 0,

package/script/midy-GMLite.d.ts

@@ -37,25 +37,7 @@ export class MidyGMLite {
     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;
-        modulationDepthRange: number;
-    }[];
+    channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -63,26 +45,9 @@ export class MidyGMLite {
     setChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
+        merger: 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;
-        modulationDepthRange: number;
-    }[];
+    createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
     createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
     convertToFloat32Array(uint8Array: any): Float32Array;
@@ -105,7 +70,7 @@ export class MidyGMLite {
     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): number;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,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;IAuBhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;MAcC;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,yCAEC;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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAx/BD;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-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,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;IAuBhB,kBAAgC;IAChC,gBAA4C;IAE5C,gBAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAcC;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,yCAEC;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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAn/BD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}