@marmooo/midy 0.0.7 → 0.0.9

package/esm/midy.js

@@ -51,7 +51,7 @@ class Note {
     }
 }
 export class Midy {
-    constructor(audioContext) {
+    constructor(audioContext, options = this.defaultOptions) {
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -75,13 +75,13 @@ export class Midy {
             configurable: true,
             writable: true,
             value: 0
-        });
+        }); // cb
         Object.defineProperty(this, "masterCoarseTuning", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: 0
-        });
+        }); // cb
         Object.defineProperty(this, "mono", {
             enumerable: true,
             configurable: true,
@@ -184,7 +184,19 @@ export class Midy {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "defaultOptions", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                reverbAlgorithm: (audioContext) => {
+                    // return this.createConvolutionReverb(audioContext);
+                    return this.createSchroederReverb(audioContext);
+                },
+            }
+        });
         this.audioContext = audioContext;
+        this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
         this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
@@ -225,23 +237,18 @@ export class Midy {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(Midy.channelSettings.pan);
+        const { gainLeft, gainRight } = this.panToGain(this.constructor.channelSettings.pan);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
         gainL.connect(merger, 0, 0);
         gainR.connect(merger, 0, 1);
-        merger.connect(this.masterGain);
-        const reverbEffect = this.createReverbEffect(audioContext);
+        const reverbEffect = this.options.reverbAlgorithm(audioContext);
         const chorusEffect = this.createChorusEffect(audioContext);
-        chorusEffect.lfo.start();
-        reverbEffect.dryGain.connect(gainL);
-        reverbEffect.dryGain.connect(gainR);
-        reverbEffect.wetGain.connect(gainL);
-        reverbEffect.wetGain.connect(gainR);
         return {
             gainL,
             gainR,
+            merger,
             reverbEffect,
             chorusEffect,
         };
@@ -249,16 +256,16 @@ export class Midy {
     createChannels(audioContext) {
         const channels = Array.from({ length: 16 }, () => {
             return {
-                ...Midy.channelSettings,
-                ...Midy.effectSettings,
+                ...this.constructor.channelSettings,
+                ...this.constructor.effectSettings,
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
                 polyphonicKeyPressure: {
-                    ...Midy.controllerDestinationSettings,
+                    ...this.constructor.controllerDestinationSettings,
                 },
                 channelPressure: {
-                    ...Midy.controllerDestinationSettings,
+                    ...this.constructor.controllerDestinationSettings,
                 },
             };
         });
@@ -589,8 +596,12 @@ export class Midy {
         }
         return noteList[0];
     }
-    createReverbEffect(audioContext, options = {}) {
+    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);
         const sampleRate = audioContext.sampleRate;
         const length = sampleRate * decay;
         const impulse = new AudioBuffer({
@@ -604,27 +615,82 @@ export class Midy {
             for (let i = 0; i < preDecayLength; i++) {
                 channelData[i] = Math.random() * 2 - 1;
             }
+            const attenuationFactor = 1 / (sampleRate * decay);
             for (let i = preDecayLength; i < length; i++) {
-                const attenuation = Math.exp(-(i - preDecayLength) / sampleRate / decay);
+                const attenuation = Math.exp(-(i - preDecayLength) * attenuationFactor);
                 channelData[i] = (Math.random() * 2 - 1) * attenuation;
             }
         }
         const convolverNode = new ConvolverNode(audioContext, {
             buffer: impulse,
         });
-        const dryGain = new GainNode(audioContext);
-        const wetGain = new GainNode(audioContext);
+        input.connect(convolverNode);
         convolverNode.connect(wetGain);
+        wetGain.connect(output);
+        dryGain.connect(output);
         return {
-            convolverNode,
+            input,
+            output,
             dryGain,
             wetGain,
+            convolverNode,
         };
     }
+    createCombFilter(audioContext, input, delay, feedback) {
+        const delayNode = new DelayNode(audioContext, {
+            maxDelayTime: delay,
+            delayTime: delay,
+        });
+        const feedbackGain = new GainNode(audioContext, { gain: feedback });
+        input.connect(delayNode);
+        delayNode.connect(feedbackGain);
+        feedbackGain.connect(delayNode);
+        return delayNode;
+    }
+    createAllpassFilter(audioContext, input, delay, feedback) {
+        const delayNode = new DelayNode(audioContext, {
+            maxDelayTime: delay,
+            delayTime: delay,
+        });
+        const feedbackGain = new GainNode(audioContext, { gain: feedback });
+        const passGain = new GainNode(audioContext, { gain: 1 - feedback });
+        input.connect(delayNode);
+        delayNode.connect(feedbackGain);
+        feedbackGain.connect(delayNode);
+        delayNode.connect(passGain);
+        return passGain;
+    }
+    // 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;
+        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);
+        }
+        const allpasses = [];
+        for (let i = 0; i < allpassDelays.length; i++) {
+            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 };
+    }
     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 });
+        const output = new GainNode(audioContext);
         const chorusGains = [];
         const delayNodes = [];
         const baseGain = 1 / chorusCount;
@@ -634,50 +700,47 @@ export class Midy {
             const delayNode = new DelayNode(audioContext, {
                 maxDelayTime: delayTime,
             });
-            delayNodes.push(delayNode);
             const chorusGain = new GainNode(audioContext, { gain: baseGain });
+            delayNodes.push(delayNode);
             chorusGains.push(chorusGain);
-            lfo.connect(lfoGain);
             lfoGain.connect(delayNode.delayTime);
             delayNode.connect(chorusGain);
+            chorusGain.connect(output);
         }
+        lfo.connect(lfoGain);
+        lfo.start();
         return {
             lfo,
             lfoGain,
             delayNodes,
             chorusGains,
+            output,
         };
     }
-    connectNoteEffects(channel, gainNode) {
+    connectEffects(channel, gainNode) {
+        gainNode.connect(channel.merger);
         if (channel.reverb === 0) {
             if (channel.chorus === 0) { // no effect
-                gainNode.connect(channel.gainL);
-                gainNode.connect(channel.gainR);
+                channel.merger.connect(this.masterGain);
             }
             else { // chorus
                 channel.chorusEffect.delayNodes.forEach((delayNode) => {
-                    gainNode.connect(delayNode);
-                });
-                channel.chorusEffect.chorusGains.forEach((chorusGain) => {
-                    chorusGain.connect(channel.gainL);
-                    chorusGain.connect(channel.gainR);
+                    channel.merger.connect(delayNode);
                 });
+                channel.chorusEffect.output.connect(this.masterGain);
             }
         }
         else {
             if (channel.chorus === 0) { // reverb
-                gainNode.connect(channel.reverbEffect.convolverNode);
-                gainNode.connect(channel.reverbEffect.dryGain);
+                channel.merger.connect(channel.reverbEffect.input);
+                channel.reverbEffect.output.connect(this.masterGain);
             }
             else { // reverb + chorus
-                gainNode.connect(channel.reverbEffect.convolverNode);
-                gainNode.connect(channel.reverbEffect.dryGain);
                 channel.chorusEffect.delayNodes.forEach((delayNode) => {
-                    gainNode.connect(delayNode);
-                });
-                channel.chorusEffect.chorusGains.forEach((chorusGain) => {
-                    chorusGain.connect(channel.reverbEffect.convolverNode);
+                    channel.merger.connect(delayNode);
                 });
+                channel.merger.connect(channel.reverbEffect.input);
+                channel.reverbEffect.output.connect(this.masterGain);
             }
         }
     }
@@ -748,7 +811,7 @@ export class Midy {
     startModulation(channel, note, time) {
         const { instrumentKey } = note;
         note.modLFOGain = new GainNode(this.audioContext, {
-            gain: this.cbToRatio(instrumentKey.modLfoToVolume) * channel.modulation,
+            gain: this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation),
         });
         note.modLFO = new OscillatorNode(this.audioContext, {
             frequency: this.centToHz(instrumentKey.freqModLFO),
@@ -817,7 +880,7 @@ export class Midy {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectNoteEffects(channel, note.gainNode);
+        this.connectEffects(channel, note.gainNode);
         if (channel.sostenutoPedal) {
             channel.sostenutoNotes.set(noteNumber, note);
         }
@@ -841,46 +904,48 @@ export class Midy {
             return;
         if (!channel.scheduledNotes.has(noteNumber))
             return;
-        const targetNotes = channel.scheduledNotes.get(noteNumber);
-        for (let i = 0; i < targetNotes.length; i++) {
-            const targetNote = targetNotes[i];
-            if (!targetNote)
+        const scheduledNotes = channel.scheduledNotes.get(noteNumber);
+        for (let i = 0; i < scheduledNotes.length; i++) {
+            const note = scheduledNotes[i];
+            if (!note)
                 continue;
-            if (targetNote.ending)
+            if (note.ending)
                 continue;
-            const { bufferSource, filterNode, gainNode, modLFO, modLFOGain, vibLFO, vibLFOGain, instrumentKey, } = targetNote;
             const velocityRate = (velocity + 127) / 127;
-            const volEndTime = stopTime + instrumentKey.volRelease * velocityRate;
-            gainNode.gain.cancelScheduledValues(stopTime);
-            gainNode.gain.linearRampToValueAtTime(0, volEndTime);
+            const volEndTime = stopTime +
+                note.instrumentKey.volRelease * velocityRate;
+            note.gainNode.gain
+                .cancelScheduledValues(stopTime)
+                .linearRampToValueAtTime(0, volEndTime);
             const maxFreq = this.audioContext.sampleRate / 2;
-            const baseFreq = this.centToHz(instrumentKey.initialFilterFc);
+            const baseFreq = this.centToHz(note.instrumentKey.initialFilterFc);
             const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-            const modEndTime = stopTime + instrumentKey.modRelease * velocityRate;
-            filterNode.frequency
+            const modEndTime = stopTime +
+                note.instrumentKey.modRelease * velocityRate;
+            note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(adjustedBaseFreq, modEndTime);
-            targetNote.ending = true;
+            note.ending = true;
             this.scheduleTask(() => {
-                bufferSource.loop = false;
+                note.bufferSource.loop = false;
             }, stopTime);
             return new Promise((resolve) => {
-                bufferSource.onended = () => {
-                    targetNotes[i] = null;
-                    bufferSource.disconnect(0);
-                    filterNode.disconnect(0);
-                    gainNode.disconnect(0);
-                    if (modLFOGain)
-                        modLFOGain.disconnect(0);
-                    if (vibLFOGain)
-                        vibLFOGain.disconnect(0);
-                    if (modLFO)
-                        modLFO.stop();
-                    if (vibLFO)
-                        vibLFO.stop();
+                note.bufferSource.onended = () => {
+                    scheduledNotes[i] = null;
+                    note.bufferSource.disconnect();
+                    note.filterNode.disconnect();
+                    note.gainNode.disconnect();
+                    if (note.modLFOGain)
+                        note.modLFOGain.disconnect();
+                    if (note.vibLFOGain)
+                        note.vibLFOGain.disconnect();
+                    if (note.modLFO)
+                        note.modLFO.stop();
+                    if (note.vibLFO)
+                        note.vibLFO.stop();
                     resolve();
                 };
-                bufferSource.stop(volEndTime);
+                note.bufferSource.stop(volEndTime);
             });
         }
     }
@@ -995,7 +1060,7 @@ export class Midy {
             case 5:
                 return this.setPortamentoTime(channelNumber, value);
             case 6:
-                return this.setDataEntry(channelNumber, value, true);
+                return this.dataEntryMSB(channelNumber, value);
             case 7:
                 return this.setVolume(channelNumber, value);
             case 10:
@@ -1005,7 +1070,7 @@ export class Midy {
             case 32:
                 return this.setBankLSB(channelNumber, value);
             case 38:
-                return this.setDataEntry(channelNumber, value, false);
+                return this.dataEntryLSB(channelNumber, value);
             case 64:
                 return this.setSustainPedal(channelNumber, value);
             case 65:
@@ -1022,13 +1087,13 @@ export class Midy {
             case 78:
                 return this.setVibratoDelay(channelNumber, value);
             case 91:
-                return this.setReverb(channelNumber, value);
+                return this.setReverbSendLevel(channelNumber, value);
             case 93:
-                return this.setChorus(channelNumber, value);
+                return this.setChorusSendLevel(channelNumber, value);
             case 96: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
-                return incrementRPNValue(channelNumber);
+                return this.dataIncrement(channelNumber);
             case 97: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
-                return decrementRPNValue(channelNumber);
+                return this.dataDecrement(channelNumber);
             case 100:
                 return this.setRPNLSB(channelNumber, value);
             case 101:
@@ -1054,22 +1119,24 @@ export class Midy {
     setBankMSB(channelNumber, msb) {
         this.channels[channelNumber].bankMSB = msb;
     }
-    setModulation(channelNumber, modulation) {
+    updateModulation(channel) {
         const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        channel.modulation = (modulation / 127) *
-            (channel.modulationDepthRange * 100);
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
             if (activeNote.modLFO) {
-                activeNote.gainNode.gain.setValueAtTime(this.cbToRatio(activeNote.instrumentKey.modLfoToVolume) *
-                    channel.modulation, now);
+                const { gainNode, instrumentKey } = activeNote;
+                gainNode.gain.setValueAtTime(this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation), now);
             }
             else {
                 this.startModulation(channel, activeNote, now);
             }
         });
     }
+    setModulation(channelNumber, modulation) {
+        const channel = this.channels[channelNumber];
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
+    }
     setPortamentoTime(channelNumber, portamentoTime) {
         this.channels[channelNumber].portamentoTime = portamentoTime / 127;
     }
@@ -1098,6 +1165,10 @@ export class Midy {
     setBankLSB(channelNumber, lsb) {
         this.channels[channelNumber].bankLSB = lsb;
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber, 0);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -1119,7 +1190,7 @@ export class Midy {
     setPortamento(channelNumber, value) {
         this.channels[channelNumber].portamento = value >= 64;
     }
-    setReverb(channelNumber, reverb) {
+    setReverbSendLevel(channelNumber, reverb) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const reverbEffect = channel.reverbEffect;
@@ -1129,7 +1200,7 @@ export class Midy {
         reverbEffect.wetGain.gain.cancelScheduledValues(now);
         reverbEffect.wetGain.gain.setValueAtTime(channel.reverb, now);
     }
-    setChorus(channelNumber, chorus) {
+    setChorusSendLevel(channelNumber, chorus) {
         const channel = this.channels[channelNumber];
         channel.chorus = chorus / 127;
         channel.chorusEffect.lfoGain = channel.chorus;
@@ -1195,31 +1266,34 @@ export class Midy {
             channel.dataMSB = minMSB;
         }
     }
-    // TODO: support 3-4?
     handleRPN(channelNumber, value) {
         const channel = this.channels[channelNumber];
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
         switch (rpn) {
             case 0:
                 channel.dataLSB += value;
-                this.handlePitchBendRangeMessage(channelNumber);
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
                 channel.dataLSB += value;
-                this.handleFineTuningMessage(channelNumber);
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
                 channel.dataMSB += value;
-                this.handleCoarseTuningMessage(channelNumber);
+                this.handleCoarseTuningRPN(channelNumber);
+                break;
+            case 5:
+                channel.dataLSB += value;
+                this.handleModulationDepthRangeRPN(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
     }
-    incrementRPNValue(channelNumber) {
+    dataIncrement(channelNumber) {
         this.handleRPN(channelNumber, 1);
     }
-    decrementRPNValue(channelNumber) {
+    dataDecrement(channelNumber) {
         this.handleRPN(channelNumber, -1);
     }
     setRPNMSB(channelNumber, value) {
@@ -1228,9 +1302,8 @@ export class Midy {
     setRPNLSB(channelNumber, value) {
         this.channels[channelNumber].rpnLSB = value;
     }
-    setDataEntry(channelNumber, value, isMSB) {
-        const channel = this.channels[channelNumber];
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber, 0);
     }
     updateDetune(channel, detuneChange) {
@@ -1244,7 +1317,7 @@ export class Midy {
                 .setValueAtTime(detune, now);
         });
     }
-    handlePitchBendRangeMessage(channelNumber) {
+    handlePitchBendRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 99);
         const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
@@ -1258,7 +1331,7 @@ export class Midy {
             channel.pitchBend * 100;
         this.updateDetune(channel, detuneChange);
     }
-    handleFineTuningMessage(channelNumber) {
+    handleFineTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
         const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
@@ -1266,9 +1339,12 @@ export class Midy {
     }
     setFineTuning(channelNumber, fineTuning) {
         const channel = this.channels[channelNumber];
+        const prevFineTuning = channel.fineTuning;
         channel.fineTuning = fineTuning;
+        const detuneChange = channel.fineTuning - prevFineTuning;
+        this.updateDetune(channel, detuneChange);
     }
-    handleCoarseTuningMessage(channelNumber) {
+    handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
         const coarseTuning = channel.dataMSB - 64;
@@ -1276,7 +1352,22 @@ export class Midy {
     }
     setCoarseTuning(channelNumber, coarseTuning) {
         const channel = this.channels[channelNumber];
-        channel.fineTuning = coarseTuning;
+        const prevCoarseTuning = channel.coarseTuning;
+        channel.coarseTuning = coarseTuning;
+        const detuneChange = channel.coarseTuning - prevCoarseTuning;
+        this.updateDetune(channel, detuneChange);
+    }
+    handleModulationDepthRangeRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitData(channel, 0, 127, 0, 127);
+        const modulationDepthRange = dataMSB + dataLSB / 128;
+        this.setModulationDepthRange(channelNumber, modulationDepthRange);
+    }
+    setModulationDepthRange(channelNumber, modulationDepthRange) {
+        const channel = this.channels[channelNumber];
+        channel.modulationDepthRange = modulationDepthRange;
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
     }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
@@ -1367,9 +1458,9 @@ export class Midy {
                 switch (data[3]) {
                     case 1:
                         return this.handleMasterVolumeSysEx(data);
-                    case 3:
+                    case 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterFineTuningSysEx(data);
-                    case 4:
+                    case 4: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterCoarseTuningSysEx(data);
                     // case 5: // TODO: Global Parameter Control
                     default:
@@ -1494,9 +1585,9 @@ Object.defineProperty(Midy, "channelSettings", {
         dataLSB: 0,
         program: 0,
         pitchBend: 0,
-        fineTuning: 0,
-        coarseTuning: 0,
-        modulationDepthRange: 0.5,
+        fineTuning: 0, // cb
+        coarseTuning: 0, // cb
+        modulationDepthRange: 0.5, // cb
     }
 });
 Object.defineProperty(Midy, "effectSettings", {

package/package.json

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