@marmooo/midy 0.1.0 → 0.1.2

package/esm/midy.js

@@ -82,7 +82,7 @@ export class Midy {
             writable: true,
             value: {
                 time: this.getReverbTime(64),
-                feedback: 0.2,
+                feedback: 0.8,
             }
         });
         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", {
@@ -223,8 +224,12 @@ export class Midy {
         this.audioContext = audioContext;
         this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
-        this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
+        this.reverbEffect = this.options.reverbAlgorithm(audioContext);
+        this.chorusEffect = this.createChorusEffect(audioContext);
+        this.chorusEffect.output.connect(this.masterGain);
+        this.reverbEffect.output.connect(this.masterGain);
+        this.masterGain.connect(audioContext.destination);
         this.GM2SystemOn();
     }
     initSoundFontTable() {
@@ -268,14 +273,11 @@ export class Midy {
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
         gainL.connect(merger, 0, 0);
         gainR.connect(merger, 0, 1);
-        const reverbEffect = this.options.reverbAlgorithm(audioContext);
-        const chorusEffect = this.createChorusEffect(audioContext);
+        merger.connect(this.masterGain);
         return {
             gainL,
             gainR,
             merger,
-            reverbEffect,
-            chorusEffect,
         };
     }
     createChannels(audioContext) {
@@ -691,12 +693,10 @@ export class Midy {
     }
     // 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, combDelays, combFeedbacks, allpassDelays, allpassFeedbacks) {
+    createSchroederReverb(audioContext, combFeedbacks, combDelays, allpassFeedbacks, allpassDelays) {
         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,62 +709,49 @@ 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);
-            }
-        }
-        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);
-            }
-        }
-    }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
     }
@@ -781,14 +768,10 @@ export class Midy {
         return instrumentKey.playbackRate(noteNumber) *
             Math.pow(2, semitoneOffset / 12);
     }
-    setVolumeEnvelope(channel, note) {
-        const { instrumentKey, startTime, velocity } = note;
+    setVolumeEnvelope(note) {
+        const { instrumentKey, startTime } = note;
         note.gainNode = new GainNode(this.audioContext, { gain: 0 });
-        let volume = (velocity / 127) * channel.volume * channel.expression;
-        if (volume === 0)
-            volume = 1e-6; // exponentialRampToValueAtTime() requires a non-zero value
-        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation) *
-            volume;
+        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
         const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
         const volDelay = startTime + instrumentKey.volDelay;
         const volAttack = volDelay + instrumentKey.volAttack;
@@ -861,7 +844,7 @@ export class Midy {
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
         note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-        this.setVolumeEnvelope(channel, note);
+        this.setVolumeEnvelope(note);
         this.setFilterEnvelope(channel, note);
         if (channel.modulation > 0) {
             const delayModLFO = startTime + instrumentKey.delayModLFO;
@@ -901,7 +884,8 @@ export class Midy {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectEffects(channel, note.gainNode);
+        note.gainNode.connect(channel.gainL);
+        note.gainNode.connect(channel.gainR);
         if (channel.sostenutoPedal) {
             channel.sostenutoNotes.set(noteNumber, note);
         }
@@ -1061,13 +1045,13 @@ export class Midy {
         }
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
-        const pitchBend = msb * 128 + lsb;
+        const pitchBend = msb * 128 + lsb - 8192;
         this.setPitchBend(channelNumber, pitchBend);
     }
     setPitchBend(channelNumber, pitchBend) {
         const channel = this.channels[channelNumber];
         const prevPitchBend = channel.pitchBend;
-        channel.pitchBend = (pitchBend - 8192) / 8192;
+        channel.pitchBend = pitchBend / 8192;
         const detuneChange = (channel.pitchBend - prevPitchBend) *
             channel.pitchBendRange * 100;
         this.updateDetune(channel, detuneChange);
@@ -1213,17 +1197,30 @@ export class Midy {
         this.channels[channelNumber].portamento = value >= 64;
     }
     setReverbSendLevel(channelNumber, reverbSendLevel) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const reverbEffect = channel.reverbEffect;
-        channel.reverbSendLevel = reverbSendLevel / 127;
-        reverbEffect.output.gain.cancelScheduledValues(now);
-        reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
+        const reverbEffect = this.reverbEffect;
+        if (0 < reverbSendLevel) {
+            const now = this.audioContext.currentTime;
+            channel.reverbSendLevel = reverbSendLevel / 127;
+            reverbEffect.output.gain.cancelScheduledValues(now);
+            reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
+        }
+        else if (channel.reverbSendLevel !== 0) {
+            channel.merger.disconnect(reverbEffect.input);
+        }
     }
     setChorusSendLevel(channelNumber, chorusSendLevel) {
         const channel = this.channels[channelNumber];
-        channel.chorusSendLevel = chorusSendLevel / 127;
-        channel.chorusEffect.lfoGain = channel.chorusSendLevel;
+        const chorusEffect = this.chorusEffect;
+        if (0 < chorusSendLevel) {
+            const now = this.audioContext.currentTime;
+            channel.chorusSendLevel = chorusSendLevel / 127;
+            chorusEffect.output.gain.cancelScheduledValues(now);
+            chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+        }
+        else if (channel.chorusSendLevel !== 0) {
+            channel.merger.disconnect(chorusEffect.input);
+        }
     }
     setSostenutoPedal(channelNumber, value) {
         const isOn = value >= 64;
@@ -1416,7 +1413,7 @@ export class Midy {
         channel.scheduledNotes.forEach((noteList) => {
             const activeNote = this.getActiveNote(noteList, now);
             if (activeNote) {
-                const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
+                const notePromise = this.scheduleNoteRelease(channelNumber, activeNote.noteNumber, velocity, now, stopPedal);
                 promises.push(notePromise);
             }
         });
@@ -1483,7 +1480,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 +1557,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,21 +1572,19 @@ 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) {
         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);
-        }
+        this.reverb.feedback = (type === 8) ? 0.9 : 0.8;
+        const { audioContext, options } = this;
+        this.reverbEffect = options.reverbAlgorithm(audioContext);
     }
     getReverbTimeFromType(type) {
         switch (type) {
@@ -1640,41 +1635,111 @@ 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 sendToReverb = this.getChorusSendToReverb(value);
+        if (0 < sendToReverb) {
+            const now = this.audioContext.currentTime;
+            this.chorus.sendToReverb = sendToReverb;
+            this.chorusEffect.sendGain.gain
+                .cancelScheduledValues(now)
+                .setValueAtTime(sendToReverb, now);
+        }
+        else if (this.chorus.sendToReverb !== 0) {
+            this.chorusEffect.sendGain.disconnect(this.reverbEffect.input);
+        }
+    }
+    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.2",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",

package/script/midy-GM1.d.ts

@@ -72,12 +72,11 @@ export class MidyGM1 {
     currentTime(): number;
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
-    connectEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
-    setVolumeEnvelope(channel: any, note: any): void;
+    setVolumeEnvelope(note: any): void;
     setFilterEnvelope(channel: any, note: any): void;
     startModulation(channel: any, note: any, time: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;

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,gBAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAcC;IAED,yCAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,kDAGC;IAED,2BAEC;IAED,4BAEC;IAED,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;AAnjCD;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;IAC5C,gBAAiD;IAKnD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;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,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,mCAcC;IACD,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;AA3iCD;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

@@ -147,8 +147,8 @@ class MidyGM1 {
         });
         this.audioContext = audioContext;
         this.masterGain = new GainNode(audioContext);
-        this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
+        this.masterGain.connect(audioContext.destination);
         this.GM1SystemOn();
     }
     initSoundFontTable() {
@@ -192,6 +192,7 @@ class MidyGM1 {
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
         gainL.connect(merger, 0, 0);
         gainR.connect(merger, 0, 1);
+        merger.connect(this.masterGain);
         return {
             gainL,
             gainR,
@@ -494,10 +495,6 @@ class MidyGM1 {
         }
         return noteList[0];
     }
-    connectEffects(channel, gainNode) {
-        gainNode.connect(channel.merger);
-        merger.connect(this.masterGain);
-    }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
     }
@@ -512,14 +509,10 @@ class MidyGM1 {
         return instrumentKey.playbackRate(noteNumber) *
             Math.pow(2, semitoneOffset / 12);
     }
-    setVolumeEnvelope(channel, note) {
-        const { instrumentKey, startTime, velocity } = note;
+    setVolumeEnvelope(note) {
+        const { instrumentKey, startTime } = note;
         note.gainNode = new GainNode(this.audioContext, { gain: 0 });
-        let volume = (velocity / 127) * channel.volume * channel.expression;
-        if (volume === 0)
-            volume = 1e-6; // exponentialRampToValueAtTime() requires a non-zero value
-        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation) *
-            volume;
+        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
         const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
         const volDelay = startTime + instrumentKey.volDelay;
         const volAttack = volDelay + instrumentKey.volAttack;
@@ -579,7 +572,7 @@ class MidyGM1 {
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
         note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-        this.setVolumeEnvelope(channel, note);
+        this.setVolumeEnvelope(note);
         this.setFilterEnvelope(channel, note);
         if (channel.modulation > 0) {
             const delayModLFO = startTime + instrumentKey.delayModLFO;
@@ -602,7 +595,8 @@ class MidyGM1 {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectEffects(channel, note.gainNode);
+        note.gainNode.connect(channel.gainL);
+        note.gainNode.connect(channel.gainR);
         const scheduledNotes = channel.scheduledNotes;
         if (scheduledNotes.has(noteNumber)) {
             scheduledNotes.get(noteNumber).push(note);
@@ -705,13 +699,13 @@ class MidyGM1 {
         channel.program = program;
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
-        const pitchBend = msb * 128 + lsb;
+        const pitchBend = msb * 128 + lsb - 8192;
         this.setPitchBend(channelNumber, pitchBend);
     }
     setPitchBend(channelNumber, pitchBend) {
         const channel = this.channels[channelNumber];
         const prevPitchBend = channel.pitchBend;
-        channel.pitchBend = (pitchBend - 8192) / 8192;
+        channel.pitchBend = pitchBend / 8192;
         const detuneChange = (channel.pitchBend - prevPitchBend) *
             channel.pitchBendRange * 100;
         this.updateDetune(channel, detuneChange);
@@ -939,7 +933,7 @@ class MidyGM1 {
         channel.scheduledNotes.forEach((noteList) => {
             const activeNote = this.getActiveNote(noteList, now);
             if (activeNote) {
-                const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
+                const notePromise = this.scheduleNoteRelease(channelNumber, activeNote.noteNumber, velocity, now, stopPedal);
                 promises.push(notePromise);
             }
         });

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;
@@ -89,6 +90,19 @@ export class MidyGM2 {
     };
     masterGain: any;
     channels: any[];
+    reverbEffect: {
+        input: any;
+        output: any;
+    };
+    chorusEffect: {
+        input: any;
+        output: any;
+        sendGain: any;
+        lfo: any;
+        lfoGain: any;
+        delayNodes: any[];
+        feedbackGains: any[];
+    };
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -97,17 +111,6 @@ export class MidyGM2 {
         gainL: any;
         gainR: any;
         merger: any;
-        reverbEffect: {
-            input: any;
-            output: any;
-        };
-        chorusEffect: {
-            lfo: any;
-            lfoGain: any;
-            delayNodes: any[];
-            chorusGains: any[];
-            output: any;
-        };
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
@@ -141,23 +144,24 @@ export class MidyGM2 {
     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): {
+    createSchroederReverb(audioContext: any, combFeedbacks: any, combDelays: any, allpassFeedbacks: any, allpassDelays: any): {
         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;
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
-    setVolumeEnvelope(channel: any, note: any): void;
+    setVolumeEnvelope(note: any): void;
     setFilterEnvelope(channel: any, note: any): void;
     startModulation(channel: any, note: any, time: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
@@ -226,19 +230,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>;