@marmooo/midy 0.0.9 → 0.1.0

package/script/midy-GM2.d.ts

@@ -4,8 +4,8 @@ export class MidyGM2 {
         volume: number;
         pan: number;
         portamentoTime: number;
-        reverb: number;
-        chorus: number;
+        reverbSendLevel: number;
+        chorusSendLevel: number;
         bank: number;
         bankMSB: number;
         bankLSB: number;
@@ -41,15 +41,22 @@ export class MidyGM2 {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: 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;
@@ -71,8 +78,6 @@ export class MidyGM2 {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: any;
         };
     };
     audioContext: any;
@@ -80,8 +85,6 @@ export class MidyGM2 {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: any;
         };
     };
     masterGain: any;
@@ -97,8 +100,6 @@ export class MidyGM2 {
         reverbEffect: {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: any;
         };
         chorusEffect: {
             lfo: any;
@@ -131,20 +132,18 @@ export class MidyGM2 {
     currentTime(): number;
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
-    createConvolutionReverb(audioContext: any, options?: {}): {
+    createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
+    createConvolutionReverb(audioContext: any, impulse: any): {
         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?: {}): {
+    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;
-        dryGain: any;
-        wetGain: any;
     };
     createChorusEffect(audioContext: any, options?: {}): {
         lfo: any;
@@ -191,8 +190,8 @@ export class MidyGM2 {
     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;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
@@ -227,6 +226,19 @@ export class MidyGM2 {
     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-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;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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAuBA;IAiCE;;;;;;;;;;;;;;;;;MAiBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAgCF;;;;;OAOC;IA9GD,qBAAmB;IACnB,kBAAc;IACd,yBAAqB;IACrB,2BAAuB;IACvB;;;MAGE;IACF;;;;;MAKE;IACF,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;;;;;MA4BE;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,kFAuBC;IAED;;;;MAWC;IAED,gFAUC;IAED,mFAYC;IAED,sGAcC;IAID;;;MAiCC;IAED;;;;;;MAoCC;IAED,kDAsBC;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;IAGD,oDAEC;IAED,mEAOC;IAED,mEAIC;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,yDAiDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,8CAeC;IAED,uCAOC;IAED,+BAOC;IAED,qDAiBC;IAED,gCAMC;IAED,kCAEC;IA2BD,4CAEC;IAED,uCAaC;IAED,+BAEC;IAED,mCAEC;IAED,oCAEC;IAED,oCAEC;IAED,wCAEC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAhsDD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/script/midy-GM2.js

@@ -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,
@@ -193,8 +207,19 @@ class MidyGM2 {
             writable: true,
             value: {
                 reverbAlgorithm: (audioContext) => {
-                    // return this.createConvolutionReverb(audioContext);
-                    return this.createSchroederReverb(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);
                 },
             }
         });
@@ -593,12 +618,7 @@ class MidyGM2 {
         }
         return noteList[0];
     }
-    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);
+    createConvolutionReverbImpulse(audioContext, decay, preDecay) {
         const sampleRate = audioContext.sampleRate;
         const length = sampleRate * decay;
         const impulse = new AudioBuffer({
@@ -618,18 +638,17 @@ class MidyGM2 {
                 channelData[i] = (Math.random() * 2 - 1) * attenuation;
             }
         }
+        return impulse;
+    }
+    createConvolutionReverb(audioContext, impulse) {
+        const output = new GainNode(audioContext);
         const convolverNode = new ConvolverNode(audioContext, {
             buffer: impulse,
         });
-        input.connect(convolverNode);
-        convolverNode.connect(wetGain);
-        wetGain.connect(output);
-        dryGain.connect(output);
+        convolverNode.connect(output);
         return {
-            input,
+            input: convolverNode,
             output,
-            dryGain,
-            wetGain,
             convolverNode,
         };
     }
@@ -657,17 +676,24 @@ class MidyGM2 {
         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, 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;
+    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),
         });
-        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);
@@ -677,11 +703,8 @@ class MidyGM2 {
             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 };
+        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;
@@ -716,11 +739,9 @@ class MidyGM2 {
     }
     connectEffects(channel, gainNode) {
         gainNode.connect(channel.merger);
-        if (channel.reverb === 0) {
-            if (channel.chorus === 0) { // no effect
-                channel.merger.connect(this.masterGain);
-            }
-            else { // chorus
+        channel.merger.connect(this.masterGain);
+        if (channel.reverbSendLevel === 0) {
+            if (channel.chorusSendLevel !== 0) { // chorus
                 channel.chorusEffect.delayNodes.forEach((delayNode) => {
                     channel.merger.connect(delayNode);
                 });
@@ -728,7 +749,7 @@ class MidyGM2 {
             }
         }
         else {
-            if (channel.chorus === 0) { // reverb
+            if (channel.chorusSendLevel === 0) { // reverb
                 channel.merger.connect(channel.reverbEffect.input);
                 channel.reverbEffect.output.connect(this.masterGain);
             }
@@ -1139,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;
@@ -1351,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() {
@@ -1386,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:
@@ -1397,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:
@@ -1409,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:
@@ -1418,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) {
@@ -1463,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]) {
@@ -1498,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.js

@@ -896,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() {
@@ -919,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) {
@@ -941,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;
@@ -44,15 +44,22 @@ export class Midy {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: 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;
@@ -74,8 +81,6 @@ export class Midy {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: any;
         };
     };
     audioContext: any;
@@ -83,8 +88,6 @@ export class Midy {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: any;
         };
     };
     masterGain: any;
@@ -100,8 +103,6 @@ export class Midy {
         reverbEffect: {
             input: any;
             output: any;
-            dryGain: any;
-            wetGain: any;
         };
         chorusEffect: {
             lfo: any;
@@ -134,20 +135,18 @@ export class Midy {
     currentTime(): number;
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
-    createConvolutionReverb(audioContext: any, options?: {}): {
+    createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
+    createConvolutionReverb(audioContext: any, impulse: any): {
         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?: {}): {
+    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;
-        dryGain: any;
-        wetGain: any;
     };
     createChorusEffect(audioContext: any, options?: {}): {
         lfo: any;
@@ -196,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;
@@ -237,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>;