@marmooo/midy 0.0.7 → 0.0.9

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;
@@ -130,6 +93,7 @@ export class MidyGM1 {
     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): {
@@ -138,6 +102,7 @@ export class MidyGM1 {
     };
     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;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
@@ -145,13 +110,13 @@ export class MidyGM1 {
     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;
-    handleFineTuningMessage(channelNumber: any): void;
+    handleFineTuningRPN(channelNumber: any): void;
     setFineTuning(channelNumber: any, fineTuning: any): void;
-    handleCoarseTuningMessage(channelNumber: any): void;
+    handleCoarseTuningRPN(channelNumber: any): void;
     setCoarseTuning(channelNumber: any, coarseTuning: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;

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,yDAiBC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;IAED,iEAOC;IAED,kDAKC;IAED,yDAGC;IAED,oDAKC;IAED,6DAGC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA1iCD;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"}

package/script/midy-GM1.js

@@ -186,23 +186,27 @@ class MidyGM1 {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(MidyGM1.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.createConvolutionReverb(audioContext);
+        const chorusEffect = this.createChorusEffect(audioContext);
         return {
             gainL,
             gainR,
+            merger,
+            reverbEffect,
+            chorusEffect,
         };
     }
     createChannels(audioContext) {
         const channels = Array.from({ length: 16 }, () => {
             return {
-                ...MidyGM1.channelSettings,
-                ...MidyGM1.effectSettings,
+                ...this.constructor.channelSettings,
+                ...this.constructor.effectSettings,
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
             };
@@ -494,9 +498,9 @@ class MidyGM1 {
         }
         return noteList[0];
     }
-    connectNoteEffects(channel, gainNode) {
-        gainNode.connect(channel.gainL);
-        gainNode.connect(channel.gainR);
+    connectEffects(channel, gainNode) {
+        gainNode.connect(channel.merger);
+        merger.connect(this.masterGain);
     }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
@@ -563,7 +567,7 @@ class MidyGM1 {
     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),
@@ -602,7 +606,7 @@ class MidyGM1 {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectNoteEffects(channel, note.gainNode);
+        this.connectEffects(channel, note.gainNode);
         const scheduledNotes = channel.scheduledNotes;
         if (scheduledNotes.has(noteNumber)) {
             scheduledNotes.get(noteNumber).push(note);
@@ -621,39 +625,41 @@ class MidyGM1 {
             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.modLFO)
+                        note.modLFO.stop();
                     resolve();
                 };
                 bufferSource.stop(volEndTime);
@@ -719,7 +725,7 @@ class MidyGM1 {
             case 1:
                 return this.setModulation(channelNumber, value);
             case 6:
-                return this.setDataEntry(channelNumber, value, true);
+                return this.dataEntryMSB(channelNumber, value);
             case 7:
                 return this.setVolume(channelNumber, value);
             case 10:
@@ -727,7 +733,7 @@ class MidyGM1 {
             case 11:
                 return this.setExpression(channelNumber, value);
             case 38:
-                return this.setDataEntry(channelNumber, value, false);
+                return this.dataEntryLSB(channelNumber, value);
             case 64:
                 return this.setSustainPedal(channelNumber, value);
             case 100:
@@ -744,22 +750,24 @@ class MidyGM1 {
                 console.warn(`Unsupported Control change: controller=${controller} value=${value}`);
         }
     }
-    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);
+    }
     setVolume(channelNumber, volume) {
         const channel = this.channels[channelNumber];
         channel.volume = volume / 127;
@@ -782,6 +790,10 @@ class MidyGM1 {
         channel.expression = expression / 127;
         this.updateChannelGain(channel);
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber, 0);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -831,13 +843,13 @@ class MidyGM1 {
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
         switch (rpn) {
             case 0:
-                this.handlePitchBendRangeMessage(channelNumber);
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
-                this.handleFineTuningMessage(channelNumber);
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
-                this.handleCoarseTuningMessage(channelNumber);
+                this.handleCoarseTuningRPN(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
@@ -849,9 +861,8 @@ class MidyGM1 {
     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) {
@@ -865,7 +876,7 @@ class MidyGM1 {
                 .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;
@@ -879,7 +890,7 @@ class MidyGM1 {
             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;
@@ -887,9 +898,12 @@ class MidyGM1 {
     }
     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;
@@ -897,7 +911,10 @@ class MidyGM1 {
     }
     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);
     }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
@@ -1024,9 +1041,9 @@ Object.defineProperty(MidyGM1, "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(MidyGM1, "effectSettings", {

package/script/midy-GM2.d.ts

@@ -37,7 +37,14 @@ export class MidyGM2 {
         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;
@@ -60,58 +67,25 @@ export class MidyGM2 {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    audioContext: any;
-    masterGain: any;
-    channels: {
-        scheduledNotes: Map<any, any>;
-        sostenutoNotes: Map<any, any>;
-        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;
-        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>;
@@ -119,8 +93,10 @@ export class MidyGM2 {
     setChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
+        merger: any;
         reverbEffect: {
-            convolverNode: any;
+            input: any;
+            output: any;
             dryGain: any;
             wetGain: any;
         };
@@ -129,58 +105,10 @@ export class MidyGM2 {
             lfoGain: any;
             delayNodes: any[];
             chorusGains: any[];
+            output: any;
         };
     };
-    createChannels(audioContext: any): {
-        scheduledNotes: Map<any, any>;
-        sostenutoNotes: Map<any, any>;
-        channelPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        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;
-        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;
@@ -203,8 +131,18 @@ export class MidyGM2 {
     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;
     };
@@ -213,8 +151,9 @@ export class MidyGM2 {
         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;
@@ -237,6 +176,7 @@ export class MidyGM2 {
     setPitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
     setBankMSB(channelNumber: any, msb: any): void;
+    updateModulation(channel: any): void;
     setModulation(channelNumber: any, modulation: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
     setVolume(channelNumber: any, volume: any): void;
@@ -247,26 +187,29 @@ export class MidyGM2 {
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
+    dataEntryLSB(channelNumber: any, value: any): void;
     updateChannelGain(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     setPortamento(channelNumber: any, value: any): void;
-    setReverb(channelNumber: any, reverb: any): void;
-    setChorus(channelNumber: any, chorus: any): void;
+    setReverbSendLevel(channelNumber: any, reverb: any): void;
+    setChorusSendLevel(channelNumber: any, chorus: any): void;
     setSostenutoPedal(channelNumber: any, value: any): void;
     setSoftPedal(channelNumber: any, softPedal: any): void;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
     limitDataMSB(channel: any, minMSB: any, maxMSB: any): void;
-    handleRPN(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;
-    handleFineTuningMessage(channelNumber: any): void;
+    handleFineTuningRPN(channelNumber: any): void;
     setFineTuning(channelNumber: any, fineTuning: any): void;
-    handleCoarseTuningMessage(channelNumber: any): void;
+    handleCoarseTuningRPN(channelNumber: any): void;
     setCoarseTuning(channelNumber: any, coarseTuning: any): void;
+    handleModulationDepthRangeRPN(channelNumber: any): void;
+    setModulationDepthRange(channelNumber: any, modulationDepthRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;MAiBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAtED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA4ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAcC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAkDC;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,wHAiCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAoDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAuDC;IAED,+CAEC;IAED,yDAiBC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAWC;IAED,uDAGC;IAED,kFAeC;IAED,2DAMC;IAED,gDAqBC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;IAED,iEAOC;IAED,kDAKC;IAED,yDAGC;IAED,oDAKC;IAED,6DAGC;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;AA17CD;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-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;MAiBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IASF;;;;;;;OAOC;IA9ED,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;IA2ClB;;;;;;;MAKE;IAGA,kBAAgC;IAChC;;;;;;;MAAqD;IACrD,gBAA4C;IAE5C,gBAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;;;;MAkBC;IAED,yCAcC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAkDC;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,wHAiCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAiDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAuDC;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,kFAeC;IAED,2DAMC;IAED,oCAqBC;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;AA7hDD;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"}