@marmooo/midy 0.1.1 → 0.1.2

package/esm/midy.js

@@ -82,7 +82,7 @@ export class Midy {
             writable: true,
             value: {
                 time: this.getReverbTime(64),
-                feedback: 0.25,
+                feedback: 0.8,
             }
         });
         Object.defineProperty(this, "chorus", {
@@ -224,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() {
@@ -269,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) {
@@ -692,7 +693,7 @@ 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);
@@ -751,21 +752,6 @@ export class Midy {
             feedbackGains,
         };
     }
-    connectEffects(channel, gainNode) {
-        gainNode.connect(channel.merger);
-        channel.merger.connect(this.masterGain);
-        if (0 < channel.reverbSendLevel) {
-            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) {
         return Math.pow(10, cb / 200);
     }
@@ -782,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;
@@ -862,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;
@@ -902,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);
         }
@@ -1062,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);
@@ -1214,20 +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 now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const chorusEffect = channel.chorusEffect;
-        channel.chorusSendLevel = chorusSendLevel / 127;
-        chorusEffect.output.gain.cancelScheduledValues(now);
-        chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+        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;
@@ -1420,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);
             }
         });
@@ -1589,11 +1582,9 @@ export class Midy {
     }
     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) {
@@ -1735,15 +1726,17 @@ export class Midy {
         return value * 0.00763;
     }
     setChorusSendToReverb(value) {
-        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
+        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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.1.1",
+  "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

@@ -90,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>;
@@ -98,19 +111,6 @@ export class MidyGM2 {
         gainL: any;
         gainR: any;
         merger: any;
-        reverbEffect: {
-            input: any;
-            output: any;
-        };
-        chorusEffect: {
-            input: any;
-            output: any;
-            sendGain: any;
-            lfo: any;
-            lfoGain: any;
-            delayNodes: any[];
-            feedbackGains: any[];
-        };
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
@@ -144,7 +144,7 @@ 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;
     };
@@ -157,12 +157,11 @@ export class MidyGM2 {
         delayNodes: 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>;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}

package/script/midy-GM2.js

@@ -85,7 +85,7 @@ class MidyGM2 {
             writable: true,
             value: {
                 time: this.getReverbTime(64),
-                feedback: 0.25,
+                feedback: 0.8,
             }
         });
         Object.defineProperty(this, "chorus", {
@@ -227,8 +227,12 @@ class MidyGM2 {
         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() {
@@ -272,14 +276,11 @@ class MidyGM2 {
         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) {
@@ -689,7 +690,7 @@ class MidyGM2 {
     }
     // 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);
@@ -748,21 +749,6 @@ class MidyGM2 {
             feedbackGains,
         };
     }
-    connectEffects(channel, gainNode) {
-        gainNode.connect(channel.merger);
-        channel.merger.connect(this.masterGain);
-        if (0 < channel.reverbSendLevel) {
-            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) {
         return Math.pow(10, cb / 200);
     }
@@ -779,14 +765,10 @@ class MidyGM2 {
         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;
@@ -846,7 +828,7 @@ class MidyGM2 {
         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;
@@ -882,7 +864,8 @@ class MidyGM2 {
         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);
         }
@@ -1025,13 +1008,13 @@ class MidyGM2 {
         }
     }
     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);
@@ -1166,20 +1149,30 @@ class MidyGM2 {
         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 now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const chorusEffect = channel.chorusEffect;
-        channel.chorusSendLevel = chorusSendLevel / 127;
-        chorusEffect.output.gain.cancelScheduledValues(now);
-        chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+        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;
@@ -1344,7 +1337,7 @@ class MidyGM2 {
         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);
             }
         });
@@ -1513,11 +1506,9 @@ class MidyGM2 {
     }
     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) {
@@ -1659,15 +1650,17 @@ class MidyGM2 {
         return value * 0.00763;
     }
     setChorusSendToReverb(value) {
-        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
+        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;

package/script/midy-GMLite.d.ts

@@ -70,12 +70,11 @@ export class MidyGMLite {
     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): number;
     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-GMLite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,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;IAuBhB,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,yCAEC;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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAn/BD;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-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,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;IAuBhB,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,yCAEC;IAED,mFAGC;IAED,mCAcC;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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA5+BD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}