@marmooo/midy 0.0.8 → 0.1.0

package/script/midy-GMLite.js

@@ -186,23 +186,23 @@ class MidyGMLite {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(MidyGMLite.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);
         return {
             gainL,
             gainR,
+            merger,
         };
     }
     createChannels(audioContext) {
         const channels = Array.from({ length: 16 }, () => {
             return {
-                ...MidyGMLite.channelSettings,
-                ...MidyGMLite.effectSettings,
+                ...this.constructor.channelSettings,
+                ...this.constructor.effectSettings,
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
             };
@@ -494,9 +494,9 @@ class MidyGMLite {
         }
         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);
@@ -562,7 +562,7 @@ class MidyGMLite {
     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),
@@ -601,7 +601,7 @@ class MidyGMLite {
         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);
@@ -620,39 +620,41 @@ class MidyGMLite {
             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);
@@ -894,11 +896,11 @@ class MidyGMLite {
                     case 2: // GM System Off
                         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() {
@@ -917,11 +919,11 @@ class MidyGMLite {
                     case 1:
                         return this.handleMasterVolumeSysEx(data);
                     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) {
@@ -939,7 +941,7 @@ class MidyGMLite {
         }
     }
     handleExclusiveMessage(data) {
-        console.warn(`Unsupported Exclusive Message ${data}`);
+        console.warn(`Unsupported Exclusive Message: ${data}`);
     }
     handleSysEx(data) {
         switch (data[0]) {

package/script/midy.d.ts

@@ -4,8 +4,8 @@ export class Midy {
         volume: number;
         pan: number;
         portamentoTime: number;
-        reverb: number;
-        chorus: number;
+        reverbSendLevel: number;
+        chorusSendLevel: number;
         vibratoRate: number;
         vibratoDepth: number;
         vibratoDelay: number;
@@ -40,12 +40,26 @@ export class Midy {
         lfoFilterDepth: number;
         lfoAmplitudeDepth: number;
     };
-    constructor(audioContext: any);
+    constructor(audioContext: any, options?: {
+        reverbAlgorithm: (audioContext: any) => {
+            input: any;
+            output: any;
+        };
+    });
     ticksPerBeat: number;
     totalTime: number;
-    reverbFactor: number;
     masterFineTuning: number;
     masterCoarseTuning: number;
+    reverb: {
+        time: number;
+        feedback: number;
+    };
+    chorus: {
+        modRate: number;
+        modDepth: number;
+        feedback: number;
+        sendToReverb: number;
+    };
     mono: boolean;
     omni: boolean;
     noteCheckInterval: number;
@@ -63,69 +77,21 @@ export class Midy {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    audioContext: any;
-    masterGain: any;
-    channels: {
-        scheduledNotes: Map<any, any>;
-        sostenutoNotes: Map<any, any>;
-        polyphonicKeyPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        channelPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
+    defaultOptions: {
+        reverbAlgorithm: (audioContext: any) => {
+            input: any;
+            output: any;
         };
-        gainL: any;
-        gainR: any;
-        reverbEffect: {
-            convolverNode: any;
-            dryGain: any;
-            wetGain: any;
-        };
-        chorusEffect: {
-            lfo: any;
-            lfoGain: any;
-            delayNodes: any[];
-            chorusGains: any[];
+    };
+    audioContext: any;
+    options: {
+        reverbAlgorithm: (audioContext: any) => {
+            input: any;
+            output: any;
         };
-        expression: number;
-        modulation: number;
-        sustainPedal: boolean;
-        portamento: boolean;
-        sostenutoPedal: boolean;
-        softPedal: number;
-        rpnMSB: number;
-        rpnLSB: number;
-        pitchBendRange: number;
-        currentBufferSource: null;
-        volume: number;
-        pan: number;
-        portamentoTime: number;
-        reverb: number;
-        chorus: number;
-        vibratoRate: number;
-        vibratoDepth: number;
-        vibratoDelay: number;
-        bank: number;
-        bankMSB: number;
-        bankLSB: number;
-        dataMSB: number;
-        dataLSB: number;
-        program: number;
-        pitchBend: number;
-        fineTuning: number;
-        coarseTuning: number;
-        modulationDepthRange: number;
-    }[];
+    };
+    masterGain: any;
+    channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -133,79 +99,20 @@ export class Midy {
     setChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
+        merger: any;
         reverbEffect: {
-            convolverNode: any;
-            dryGain: any;
-            wetGain: any;
+            input: any;
+            output: any;
         };
         chorusEffect: {
             lfo: any;
             lfoGain: any;
             delayNodes: any[];
             chorusGains: any[];
+            output: any;
         };
     };
-    createChannels(audioContext: any): {
-        scheduledNotes: Map<any, any>;
-        sostenutoNotes: Map<any, any>;
-        polyphonicKeyPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        channelPressure: {
-            pitchControl: number;
-            filterCutoffControl: number;
-            amplitudeControl: number;
-            lfoPitchDepth: number;
-            lfoFilterDepth: number;
-            lfoAmplitudeDepth: number;
-        };
-        gainL: any;
-        gainR: any;
-        reverbEffect: {
-            convolverNode: any;
-            dryGain: any;
-            wetGain: any;
-        };
-        chorusEffect: {
-            lfo: any;
-            lfoGain: any;
-            delayNodes: any[];
-            chorusGains: any[];
-        };
-        expression: number;
-        modulation: number;
-        sustainPedal: boolean;
-        portamento: boolean;
-        sostenutoPedal: boolean;
-        softPedal: number;
-        rpnMSB: number;
-        rpnLSB: number;
-        pitchBendRange: number;
-        currentBufferSource: null;
-        volume: number;
-        pan: number;
-        portamentoTime: number;
-        reverb: number;
-        chorus: number;
-        vibratoRate: number;
-        vibratoDepth: number;
-        vibratoDelay: number;
-        bank: number;
-        bankMSB: number;
-        bankLSB: number;
-        dataMSB: number;
-        dataLSB: number;
-        program: number;
-        pitchBend: number;
-        fineTuning: number;
-        coarseTuning: number;
-        modulationDepthRange: number;
-    }[];
+    createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
     createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
     convertToFloat32Array(uint8Array: any): Float32Array;
@@ -228,18 +135,27 @@ export class Midy {
     currentTime(): number;
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
-    createReverbEffect(audioContext: any, options?: {}): {
+    createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
+    createConvolutionReverb(audioContext: any, impulse: any): {
+        input: any;
+        output: any;
         convolverNode: any;
-        dryGain: any;
-        wetGain: any;
+    };
+    createCombFilter(audioContext: any, input: any, delay: any, feedback: any): any;
+    createAllpassFilter(audioContext: any, input: any, delay: any, feedback: any): any;
+    generateDistributedArray(center: any, count: any, varianceRatio?: number, randomness?: number): any[];
+    createSchroederReverb(audioContext: any, combDelays: any, combFeedbacks: any, allpassDelays: any, allpassFeedbacks: any): {
+        input: any;
+        output: any;
     };
     createChorusEffect(audioContext: any, options?: {}): {
         lfo: any;
         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;
@@ -279,8 +195,8 @@ export class Midy {
     updateChannelGain(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     setPortamento(channelNumber: any, value: any): void;
-    setReverbSendLevel(channelNumber: any, reverb: any): void;
-    setChorusSendLevel(channelNumber: any, chorus: any): void;
+    setReverbSendLevel(channelNumber: any, reverbSendLevel: any): void;
+    setChorusSendLevel(channelNumber: any, chorusSendLevel: any): void;
     setSostenutoPedal(channelNumber: any, value: any): void;
     setSoftPedal(channelNumber: any, softPedal: any): void;
     setVibratoRate(channelNumber: any, vibratoRate: any): void;
@@ -320,6 +236,19 @@ export class Midy {
     setMasterFineTuning(fineTuning: any): void;
     handleMasterCoarseTuningSysEx(data: any): void;
     setMasterCoarseTuning(coarseTuning: any): void;
+    handleGlobalParameterControl(data: any): void;
+    handleReverbParameter(data: any): void;
+    setReverbType(type: any): void;
+    getReverbTimeFromType(type: any): number | undefined;
+    setReverbTime(value: any): void;
+    getReverbTime(value: any): number;
+    calcDelay(rt60: any, feedback: any): number;
+    handleChorusParameter(data: any): void;
+    setChorusType(type: any): void;
+    setChorusModRate(value: any): void;
+    setChorusModDepth(value: any): void;
+    setChorusFeedback(value: any): void;
+    setChorusSendToReverb(value: any): void;
     handleExclusiveMessage(data: any): void;
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;

package/script/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAzED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA+ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiBC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MAqCC;IAED,sDA6BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,uDAcC;IAED,wHAqCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAwDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAqBC;IAED,sFAcC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAkEC;IAED,+CAEC;IAED,qCAcC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,0DASC;IAED,0DAIC;IAED,wDAWC;IAED,uDAGC;IAED,2DAGC;IAED,6DAGC;IAED,6DASC;IAED,kFAeC;IAED,2DAMC;IAED,gDAyBC;IAED,wCAEC;IAED,wCAEC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,wDAKC;IAED,6EAKC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAxjDD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}