@marmooo/midy 0.0.7 → 0.0.9

package/esm/midy-GM2.js

@@ -51,7 +51,7 @@ class Note {
     }
 }
 export class MidyGM2 {
-    constructor(audioContext) {
+    constructor(audioContext, options = this.defaultOptions) {
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -75,13 +75,13 @@ export class MidyGM2 {
             configurable: true,
             writable: true,
             value: 0
-        });
+        }); // cb
         Object.defineProperty(this, "masterCoarseTuning", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: 0
-        });
+        }); // cb
         Object.defineProperty(this, "mono", {
             enumerable: true,
             configurable: true,
@@ -184,7 +184,19 @@ export class MidyGM2 {
             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 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,
         };
@@ -249,13 +256,13 @@ export 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,
                 },
             };
         });
@@ -583,8 +590,12 @@ export class MidyGM2 {
         }
         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({
@@ -598,27 +609,82 @@ export 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;
             }
         }
         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;
@@ -628,50 +694,47 @@ export 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) {
+    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);
             }
         }
     }
@@ -742,7 +805,7 @@ export 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),
@@ -794,7 +857,7 @@ export 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);
         }
@@ -818,42 +881,48 @@ export 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);
             });
         }
     }
@@ -951,7 +1020,7 @@ export class MidyGM2 {
             case 5:
                 return this.setPortamentoTime(channelNumber, value);
             case 6:
-                return this.setDataEntry(channelNumber, value, true);
+                return this.dataEntryMSB(channelNumber, value);
             case 7:
                 return this.setVolume(channelNumber, value);
             case 10:
@@ -961,7 +1030,7 @@ export class MidyGM2 {
             case 32:
                 return this.setBankLSB(channelNumber, value);
             case 38:
-                return this.setDataEntry(channelNumber, value, false);
+                return this.dataEntryLSB(channelNumber, value);
             case 64:
                 return this.setSustainPedal(channelNumber, value);
             case 65:
@@ -971,9 +1040,9 @@ export class MidyGM2 {
             case 67:
                 return this.setSoftPedal(channelNumber, value);
             case 91:
-                return this.setReverb(channelNumber, value);
+                return this.setReverbSendLevel(channelNumber, value);
             case 93:
-                return this.setChorus(channelNumber, value);
+                return this.setChorusSendLevel(channelNumber, value);
             case 100:
                 return this.setRPNLSB(channelNumber, value);
             case 101:
@@ -999,22 +1068,24 @@ export class MidyGM2 {
     setBankMSB(channelNumber, msb) {
         this.channels[channelNumber].bankMSB = msb;
     }
-    setModulation(channelNumber, modulation) {
+    updateModulation(channel) {
         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);
+                const { gainNode, instrumentKey } = activeNote;
+                gainNode.gain.setValueAtTime(this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation), now);
             }
             else {
                 this.startModulation(channel, activeNote, now);
             }
         });
     }
+    setModulation(channelNumber, modulation) {
+        const channel = this.channels[channelNumber];
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
+    }
     setPortamentoTime(channelNumber, portamentoTime) {
         this.channels[channelNumber].portamentoTime = portamentoTime / 127;
     }
@@ -1043,6 +1114,10 @@ export class MidyGM2 {
     setBankLSB(channelNumber, lsb) {
         this.channels[channelNumber].bankLSB = lsb;
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -1064,7 +1139,7 @@ export class MidyGM2 {
     setPortamento(channelNumber, value) {
         this.channels[channelNumber].portamento = value >= 64;
     }
-    setReverb(channelNumber, reverb) {
+    setReverbSendLevel(channelNumber, reverb) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const reverbEffect = channel.reverbEffect;
@@ -1074,7 +1149,7 @@ export class MidyGM2 {
         reverbEffect.wetGain.gain.cancelScheduledValues(now);
         reverbEffect.wetGain.gain.setValueAtTime(channel.reverb, now);
     }
-    setChorus(channelNumber, chorus) {
+    setChorusSendLevel(channelNumber, chorus) {
         const channel = this.channels[channelNumber];
         channel.chorus = chorus / 127;
         channel.chorusEffect.lfoGain = channel.chorus;
@@ -1122,21 +1197,21 @@ export class MidyGM2 {
             channel.dataMSB = minMSB;
         }
     }
-    handleRPN(channelNumber, value) {
+    handleRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
         switch (rpn) {
             case 0:
-                channel.dataLSB += value;
-                this.handlePitchBendRangeMessage(channelNumber);
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
-                channel.dataLSB += value;
-                this.handleFineTuningMessage(channelNumber);
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
-                channel.dataMSB += value;
-                this.handleCoarseTuningMessage(channelNumber);
+                this.handleCoarseTuningRPN(channelNumber);
+                break;
+            case 5:
+                this.handleModulationDepthRangeRPN(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
@@ -1148,9 +1223,8 @@ export class MidyGM2 {
     setRPNLSB(channelNumber, value) {
         this.channels[channelNumber].rpnLSB = value;
     }
-    setDataEntry(channelNumber, value, isMSB) {
-        const channel = this.channels[channelNumber];
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber);
     }
     updateDetune(channel, detuneChange) {
@@ -1164,7 +1238,7 @@ export class MidyGM2 {
                 .setValueAtTime(detune, now);
         });
     }
-    handlePitchBendRangeMessage(channelNumber) {
+    handlePitchBendRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 99);
         const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
@@ -1178,7 +1252,7 @@ export class MidyGM2 {
             channel.pitchBend * 100;
         this.updateDetune(channel, detuneChange);
     }
-    handleFineTuningMessage(channelNumber) {
+    handleFineTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
         const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
@@ -1186,9 +1260,12 @@ export class MidyGM2 {
     }
     setFineTuning(channelNumber, fineTuning) {
         const channel = this.channels[channelNumber];
+        const prevFineTuning = channel.fineTuning;
         channel.fineTuning = fineTuning;
+        const detuneChange = channel.fineTuning - prevFineTuning;
+        this.updateDetune(channel, detuneChange);
     }
-    handleCoarseTuningMessage(channelNumber) {
+    handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
         const coarseTuning = channel.dataMSB - 64;
@@ -1196,7 +1273,22 @@ export class MidyGM2 {
     }
     setCoarseTuning(channelNumber, coarseTuning) {
         const channel = this.channels[channelNumber];
-        channel.fineTuning = coarseTuning;
+        const prevCoarseTuning = channel.coarseTuning;
+        channel.coarseTuning = coarseTuning;
+        const detuneChange = channel.coarseTuning - prevCoarseTuning;
+        this.updateDetune(channel, detuneChange);
+    }
+    handleModulationDepthRangeRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitData(channel, 0, 127, 0, 127);
+        const modulationDepthRange = dataMSB + dataLSB / 128;
+        this.setModulationDepthRange(channelNumber, modulationDepthRange);
+    }
+    setModulationDepthRange(channelNumber, modulationDepthRange) {
+        const channel = this.channels[channelNumber];
+        channel.modulationDepthRange = modulationDepthRange;
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
     }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
@@ -1287,9 +1379,9 @@ export class MidyGM2 {
                 switch (data[3]) {
                     case 1:
                         return this.handleMasterVolumeSysEx(data);
-                    case 3:
+                    case 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterFineTuningSysEx(data);
-                    case 4:
+                    case 4: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterCoarseTuningSysEx(data);
                     // case 5: // TODO: Global Parameter Control
                     default:
@@ -1400,7 +1492,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
     value: {
         currentBufferSource: null,
         volume: 100 / 127,
-        pan: 0,
+        pan: 64,
         portamentoTime: 0,
         reverb: 0,
         chorus: 0,
@@ -1411,9 +1503,9 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         dataLSB: 0,
         program: 0,
         pitchBend: 0,
-        fineTuning: 0,
-        coarseTuning: 0,
-        modulationDepthRange: 0.5,
+        fineTuning: 0, // cb
+        coarseTuning: 0, // cb
+        modulationDepthRange: 0.5, // cb
     }
 });
 Object.defineProperty(MidyGM2, "effectSettings", {

package/esm/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;
@@ -124,6 +89,7 @@ export class MidyGMLite {
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
+    updateModulation(channel: any): void;
     setModulation(channelNumber: any, modulation: any): void;
     setVolume(channelNumber: any, volume: any): void;
     panToGain(pan: any): {
@@ -132,14 +98,15 @@ export class MidyGMLite {
     };
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
+    dataEntryLSB(channelNumber: any, value: any): void;
     updateChannelGain(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     handleRPN(channelNumber: any): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
-    setDataEntry(channelNumber: any, value: any, isMSB: any): void;
+    dataEntryMSB(channelNumber: any, value: any): void;
     updateDetune(channel: any, detuneChange: any): void;
-    handlePitchBendRangeMessage(channelNumber: any): void;
+    handlePitchBendRangeRPN(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;

package/esm/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,yDAiBC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,sCAUC;IAED,sDAMC;IAED,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;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;AAl/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"}