@marmooo/midy 0.1.0 → 0.1.1

package/esm/midy.js

@@ -82,7 +82,7 @@ export class Midy {
             writable: true,
             value: {
                 time: this.getReverbTime(64),
-                feedback: 0.2,
+                feedback: 0.25,
             }
         });
         Object.defineProperty(this, "chorus", {
@@ -90,10 +90,11 @@ export class Midy {
             configurable: true,
             writable: true,
             value: {
-                modRate: 3 * 0.122,
-                modDepth: (3 + 1) / 3.2,
-                feedback: 8 * 0.763,
-                sendToReverb: 0 * 0.787,
+                modRate: this.getChorusModRate(3),
+                modDepth: this.getChorusModDepth(19),
+                feedback: this.getChorusFeedback(8),
+                sendToReverb: this.getChorusSendToReverb(0),
+                delayTimes: this.generateDistributedArray(0.02, 2, 0.5),
             }
         });
         Object.defineProperty(this, "mono", {
@@ -694,9 +695,7 @@ export class Midy {
     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 mergerGain = new GainNode(audioContext);
         for (let i = 0; i < combDelays.length; i++) {
             const comb = this.createCombFilter(audioContext, input, combDelays[i], combFeedbacks[i]);
             comb.connect(mergerGain);
@@ -709,60 +708,62 @@ export class Midy {
         allpasses.at(-1).connect(output);
         return { input, output };
     }
-    createChorusEffect(audioContext, options = {}) {
-        const { chorusCount = 2, chorusRate = 0.6, chorusDepth = 0.15, delay = 0.01, variance = delay * 0.1, } = options;
-        const lfo = new OscillatorNode(audioContext, { frequency: chorusRate });
-        const lfoGain = new GainNode(audioContext, { gain: chorusDepth });
+    createChorusEffect(audioContext) {
+        const input = new GainNode(audioContext);
         const output = new GainNode(audioContext);
-        const chorusGains = [];
+        const sendGain = new GainNode(audioContext);
+        const lfo = new OscillatorNode(audioContext, {
+            frequency: this.chorus.modRate,
+        });
+        const lfoGain = new GainNode(audioContext, {
+            gain: this.chorus.modDepth / 2,
+        });
+        const delayTimes = this.chorus.delayTimes;
         const delayNodes = [];
-        const baseGain = 1 / chorusCount;
-        for (let i = 0; i < chorusCount; i++) {
-            const randomDelayFactor = (Math.random() - 0.5) * variance;
-            const delayTime = (i + 1) * delay + randomDelayFactor;
+        const feedbackGains = [];
+        for (let i = 0; i < delayTimes.length; i++) {
+            const delayTime = delayTimes[i];
             const delayNode = new DelayNode(audioContext, {
-                maxDelayTime: delayTime,
+                maxDelayTime: 0.1, // generally, 5ms < delayTime < 50ms
+                delayTime,
+            });
+            const feedbackGain = new GainNode(audioContext, {
+                gain: this.chorus.feedback,
             });
-            const chorusGain = new GainNode(audioContext, { gain: baseGain });
             delayNodes.push(delayNode);
-            chorusGains.push(chorusGain);
+            feedbackGains.push(feedbackGain);
+            input.connect(delayNode);
             lfoGain.connect(delayNode.delayTime);
-            delayNode.connect(chorusGain);
-            chorusGain.connect(output);
+            delayNode.connect(feedbackGain);
+            feedbackGain.connect(delayNode);
+            delayNode.connect(output);
         }
+        output.connect(sendGain);
         lfo.connect(lfoGain);
         lfo.start();
         return {
+            input,
+            output,
+            sendGain,
             lfo,
             lfoGain,
             delayNodes,
-            chorusGains,
-            output,
+            feedbackGains,
         };
     }
     connectEffects(channel, gainNode) {
         gainNode.connect(channel.merger);
         channel.merger.connect(this.masterGain);
-        if (channel.reverbSendLevel === 0) {
-            if (channel.chorusSendLevel !== 0) { // chorus
-                channel.chorusEffect.delayNodes.forEach((delayNode) => {
-                    channel.merger.connect(delayNode);
-                });
-                channel.chorusEffect.output.connect(this.masterGain);
-            }
+        if (0 < channel.reverbSendLevel) {
+            channel.merger.connect(channel.reverbEffect.input);
+            channel.reverbEffect.output.connect(this.masterGain);
         }
-        else {
-            if (channel.chorusSendLevel === 0) { // reverb
-                channel.merger.connect(channel.reverbEffect.input);
-                channel.reverbEffect.output.connect(this.masterGain);
-            }
-            else { // reverb + chorus
-                channel.chorusEffect.delayNodes.forEach((delayNode) => {
-                    channel.merger.connect(delayNode);
-                });
-                channel.merger.connect(channel.reverbEffect.input);
-                channel.reverbEffect.output.connect(this.masterGain);
-            }
+        if (0 < channel.chorusSendLevel) {
+            channel.merger.connect(channel.chorusEffect.input);
+            channel.reverbEffect.output.connect(this.masterGain);
+        }
+        if (0 < this.chorus.sendToReverb) {
+            channel.chorusEffect.sendGain.connect(channel.reverbEffect.input);
         }
     }
     cbToRatio(cb) {
@@ -1221,9 +1222,12 @@ export class Midy {
         reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
     }
     setChorusSendLevel(channelNumber, chorusSendLevel) {
+        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        const chorusEffect = channel.chorusEffect;
         channel.chorusSendLevel = chorusSendLevel / 127;
-        channel.chorusEffect.lfoGain = channel.chorusSendLevel;
+        chorusEffect.output.gain.cancelScheduledValues(now);
+        chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
     }
     setSostenutoPedal(channelNumber, value) {
         const isOn = value >= 64;
@@ -1483,7 +1487,7 @@ export class Midy {
                     case 4: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterCoarseTuningSysEx(data);
                     case 5:
-                        return this.handleGlobalParameterControl(data);
+                        return this.handleGlobalParameterControlSysEx(data);
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
@@ -1560,13 +1564,13 @@ export class Midy {
             this.masterCoarseTuning = coarseTuning - 64;
         }
     }
-    handleGlobalParameterControl(data) {
-        if (data[5] === 1) {
-            switch (data[6]) {
+    handleGlobalParameterControlSysEx(data) {
+        if (data[7] === 1) {
+            switch (data[8]) {
                 case 1:
-                    return this.handleReverbParameter(data);
+                    return this.handleReverbParameterSysEx(data);
                 case 2:
-                    return this.handleChorusParameter(data);
+                    return this.handleChorusParameterSysEx(data);
                 default:
                     console.warn(`Unsupported Global Parameter Control Message: ${data}`);
             }
@@ -1575,12 +1579,12 @@ export class Midy {
             console.warn(`Unsupported Global Parameter Control Message: ${data}`);
         }
     }
-    handleReverbParameter(data) {
-        switch (data[7]) {
+    handleReverbParameterSysEx(data) {
+        switch (data[9]) {
             case 0:
-                return this.setReverbType(data[8]);
+                return this.setReverbType(data[10]);
             case 1:
-                return this.setReverbTime(data[8]);
+                return this.setReverbTime(data[10]);
         }
     }
     setReverbType(type) {
@@ -1640,41 +1644,109 @@ export class Midy {
     //   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.
+    //   The structure of a concert hall is complex,
+    //   so estimates based on mean free path are unstable.
+    //   It is easier to determine the delay based on ideal feedback.
+    //   The average sound absorption coefficient
+    //   suitable for playing musical instruments is 0.18 to 0.28.
     //   delay = -RT60 * Math.log10(feedback) / 3
     calcDelay(rt60, feedback) {
         return -rt60 * Math.log10(feedback) / 3;
     }
-    handleChorusParameter(data) {
-        switch (data[7]) {
+    handleChorusParameterSysEx(data) {
+        switch (data[9]) {
             case 0:
-                return this.setChorusType(data[8]);
+                return this.setChorusType(data[10]);
             case 1:
-                return this.setChorusModRate(data[8]);
+                return this.setChorusModRate(data[10]);
             case 2:
-                return this.setChorusModDepth(data[8]);
+                return this.setChorusModDepth(data[10]);
             case 3:
-                return this.setChorusFeedback(data[8]);
+                return this.setChorusFeedback(data[10]);
             case 4:
-                return this.setChorusSendToReverb(data[8]);
+                return this.setChorusSendToReverb(data[10]);
         }
     }
     setChorusType(type) {
-        // TODO
+        switch (type) {
+            case 0:
+                return this.setChorusParameter(3, 5, 0, 0);
+            case 1:
+                return this.setChorusParameter(9, 19, 5, 0);
+            case 2:
+                return this.setChorusParameter(3, 19, 8, 0);
+            case 3:
+                return this.setChorusParameter(9, 16, 16, 0);
+            case 4:
+                return this.setChorusParameter(2, 24, 64, 0);
+            case 5:
+                return this.setChorusParameter(1, 5, 112, 0);
+            default:
+                console.warn(`Unsupported Chorus Type: ${type}`);
+        }
+    }
+    setChorusParameter(modRate, modDepth, feedback, sendToReverb) {
+        this.setChorusModRate(modRate);
+        this.setChorusModDepth(modDepth);
+        this.setChorusFeedback(feedback);
+        this.setChorusSendToReverb(sendToReverb);
     }
     setChorusModRate(value) {
-        // TODO
+        const now = this.audioContext.currentTime;
+        const modRate = this.getChorusModRate(value);
+        this.chorus.modRate = modRate;
+        for (let i = 0; i < this.channels.length; i++) {
+            const lfo = this.channels[i].chorusEffect.lfo;
+            lfo.frequency.setValueAtTime(modRate, now);
+        }
+    }
+    getChorusModRate(value) {
+        return value * 0.122; // Hz
     }
     setChorusModDepth(value) {
-        // TODO
+        const now = this.audioContext.currentTime;
+        const modDepth = this.getChorusModDepth(value);
+        this.chorus.modDepth = modDepth;
+        for (let i = 0; i < this.channels.length; i++) {
+            const chorusEffect = this.channels[i].chorusEffect;
+            chorusEffect.lfoGain.gain
+                .cancelScheduledValues(now)
+                .setValueAtTime(modDepth / 2, now);
+        }
+    }
+    getChorusModDepth(value) {
+        return (value + 1) / 3200; // second
     }
     setChorusFeedback(value) {
-        // TODO
+        const now = this.audioContext.currentTime;
+        const feedback = this.getChorusFeedback(value);
+        this.chorus.feedback = feedback;
+        for (let i = 0; i < this.channels.length; i++) {
+            const chorusEffect = this.channels[i].chorusEffect;
+            for (let j = 0; j < chorusEffect.feedbackGains.length; j++) {
+                const feedbackGain = chorusEffect.feedbackGains[j];
+                feedbackGain.gain
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(feedback, now);
+            }
+        }
+    }
+    getChorusFeedback(value) {
+        return value * 0.00763;
     }
     setChorusSendToReverb(value) {
-        // TODO
+        const now = this.audioContext.currentTime;
+        const sendToReverb = this.getChorusSendToReverb(value);
+        this.chorus.sendToReverb = sendToReverb;
+        for (let i = 0; i < this.channels.length; i++) {
+            const chorusEffect = this.channels[i].chorusEffect;
+            chorusEffect.sendGain.gain
+                .cancelScheduledValues(now)
+                .setValueAtTime(sendToReverb, now);
+        }
+    }
+    getChorusSendToReverb(value) {
+        return value * 0.00787;
     }
     handleExclusiveMessage(data) {
         console.warn(`Unsupported Exclusive Message: ${data}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",

package/script/midy-GM2.d.ts

@@ -56,6 +56,7 @@ export class MidyGM2 {
         modDepth: number;
         feedback: number;
         sendToReverb: number;
+        delayTimes: any[];
     };
     mono: boolean;
     omni: boolean;
@@ -102,11 +103,13 @@ export class MidyGM2 {
             output: any;
         };
         chorusEffect: {
+            input: any;
+            output: any;
+            sendGain: any;
             lfo: any;
             lfoGain: any;
             delayNodes: any[];
-            chorusGains: any[];
-            output: any;
+            feedbackGains: any[];
         };
     };
     createChannels(audioContext: any): any[];
@@ -145,12 +148,14 @@ export class MidyGM2 {
         input: any;
         output: any;
     };
-    createChorusEffect(audioContext: any, options?: {}): {
+    createChorusEffect(audioContext: any): {
+        input: any;
+        output: any;
+        sendGain: any;
         lfo: any;
         lfoGain: any;
         delayNodes: any[];
-        chorusGains: any[];
-        output: any;
+        feedbackGains: any[];
     };
     connectEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
@@ -226,19 +231,24 @@ export class MidyGM2 {
     setMasterFineTuning(fineTuning: any): void;
     handleMasterCoarseTuningSysEx(data: any): void;
     setMasterCoarseTuning(coarseTuning: any): void;
-    handleGlobalParameterControl(data: any): void;
-    handleReverbParameter(data: any): void;
+    handleGlobalParameterControlSysEx(data: any): void;
+    handleReverbParameterSysEx(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;
+    handleChorusParameterSysEx(data: any): void;
     setChorusType(type: any): void;
+    setChorusParameter(modRate: any, modDepth: any, feedback: any, sendToReverb: any): void;
     setChorusModRate(value: any): void;
+    getChorusModRate(value: any): number;
     setChorusModDepth(value: any): void;
+    getChorusModDepth(value: any): number;
     setChorusFeedback(value: any): void;
+    getChorusFeedback(value: any): number;
     setChorusSendToReverb(value: any): void;
+    getChorusSendToReverb(value: any): number;
     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;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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}