@marmooo/midy 0.0.3 → 0.0.4

package/script/midy.js

@@ -209,6 +209,12 @@ class Midy {
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
+                polyphonicKeyPressure: {
+                    ...Midy.controllerDestinationSettings,
+                },
+                channelPressure: {
+                    ...Midy.controllerDestinationSettings,
+                },
             };
         });
         return channels;
@@ -263,9 +269,6 @@ class Midy {
             if (event.startTime > t + this.lookAhead)
                 break;
             switch (event.type) {
-                case "controller":
-                    this.handleControlChange(this.omni ? 0 : event.channel, event.controllerType, event.value);
-                    break;
                 case "noteOn":
                     if (event.velocity !== 0) {
                         await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
@@ -279,9 +282,21 @@ class Midy {
                     }
                     break;
                 }
+                case "noteAftertouch":
+                    this.handlePolyphonicKeyPressure(event.channel, event.noteNumber, event.amount);
+                    break;
+                case "controller":
+                    this.handleControlChange(this.omni ? 0 : event.channel, event.controllerType, event.value);
+                    break;
                 case "programChange":
                     this.handleProgramChange(event.channel, event.programNumber);
                     break;
+                case "channelAftertouch":
+                    this.handleChannelPressure(event.channel, event.amount);
+                    break;
+                case "pitchBend":
+                    this.handlePitchBend(event.channel, event.value);
+                    break;
                 case "sysEx":
                     this.handleSysEx(event.data);
             }
@@ -645,15 +660,19 @@ class Midy {
     centToHz(cent) {
         return 8.176 * Math.pow(2, cent / 1200);
     }
-    async createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3) {
+    calcSemitoneOffset(channel) {
         const masterTuning = this.masterCoarseTuning + this.masterFineTuning;
         const channelTuning = channel.coarseTuning + channel.fineTuning;
         const tuning = masterTuning + channelTuning;
-        const semitoneOffset = channel.pitchBend * channel.pitchBendRange + tuning;
-        const playbackRate = noteInfo.playbackRate(noteNumber) *
-            Math.pow(2, semitoneOffset / 12);
+        return channel.pitchBend * channel.pitchBendRange + tuning;
+    }
+    calcPlaybackRate(noteInfo, noteNumber, semitoneOffset) {
+        return noteInfo.playbackRate(noteNumber) * Math.pow(2, semitoneOffset / 12);
+    }
+    async createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3) {
         const bufferSource = await this.createNoteBufferNode(noteInfo, isSF3);
-        bufferSource.playbackRate.value = playbackRate;
+        const semitoneOffset = this.calcSemitoneOffset(channel);
+        bufferSource.playbackRate.value = this.calcPlaybackRate(noteInfo, noteNumber, semitoneOffset);
         // volume envelope
         const gainNode = new GainNode(this.audioContext, {
             gain: 0,
@@ -717,7 +736,7 @@ class Midy {
             channel.currentBufferSource = bufferSource;
         }
         bufferSource.start(startTime, noteInfo.start / noteInfo.sampleRate);
-        return { bufferSource, gainNode, filterNode };
+        return { bufferSource, gainNode, filterNode, lfoGain };
     }
     calcBank(channel, channelNumber) {
         if (channel.bankMSB === 121) {
@@ -739,7 +758,7 @@ class Midy {
         const noteInfo = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber);
         if (!noteInfo)
             return;
-        const { bufferSource, gainNode, filterNode } = await this
+        const { bufferSource, gainNode, filterNode, lfoGain } = await this
             .createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3);
         this.connectNoteEffects(channel, gainNode);
         if (channel.sostenutoPedal) {
@@ -859,7 +878,7 @@ class Midy {
             case 0x90:
                 return this.noteOn(channelNumber, data1, data2);
             case 0xA0:
-                return this.handlePolyphonicKeyPressure(channelNumber, data1, data2);
+                return; // this.handlePolyphonicKeyPressure(channelNumber, data1, data2);
             case 0xB0:
                 return this.handleControlChange(channelNumber, data1, data2);
             case 0xC0:
@@ -867,7 +886,7 @@ class Midy {
             case 0xD0:
                 return this.handleChannelPressure(channelNumber, data1);
             case 0xE0:
-                return this.handlePitchBend(channelNumber, data1, data2);
+                return this.handlePitchBendMessage(channelNumber, data1, data2);
             default:
                 console.warn(`Unsupported MIDI message: ${messageType.toString(16)}`);
         }
@@ -875,17 +894,16 @@ class Midy {
     handlePolyphonicKeyPressure(channelNumber, noteNumber, pressure) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        const scheduledNotes = channel.scheduledNotes.get(noteNumber);
-        pressure /= 127;
-        if (scheduledNotes) {
-            scheduledNotes.forEach((scheduledNote) => {
-                if (scheduledNote) {
-                    const { initialAttenuation } = scheduledNote.noteInfo;
-                    const gain = this.cbToRatio(-initialAttenuation) * pressure;
-                    scheduledNote.gainNode.gain.cancelScheduledValues(now);
-                    scheduledNote.gainNode.gain.setValueAtTime(gain, now);
-                }
-            });
+        pressure /= 64;
+        const activeNotes = this.getActiveNotes(channel);
+        if (channel.polyphonicKeyPressure.amplitudeControl !== 1) {
+            if (activeNotes.has(noteNumber)) {
+                const activeNote = activeNotes.get(noteNumber);
+                const gain = activeNote.gainNode.gain.value;
+                activeNote.gainNode.gain
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(gain * pressure, now);
+            }
         }
     }
     handleProgramChange(channelNumber, program) {
@@ -894,11 +912,37 @@ class Midy {
         channel.program = program;
     }
     handleChannelPressure(channelNumber, pressure) {
-        this.channels[channelNumber].channelPressure = pressure;
+        const now = this.audioContext.currentTime;
+        const channel = this.channels[channelNumber];
+        pressure /= 64;
+        channel.channelPressure = pressure;
+        const activeNotes = this.getActiveNotes(channel);
+        if (channel.channelPressure.amplitudeControl !== 1) {
+            activeNotes.forEach((activeNote) => {
+                const gain = activeNote.gainNode.gain.value;
+                activeNote.gainNode.gain
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(gain * pressure, now);
+            });
+        }
     }
-    handlePitchBend(channelNumber, lsb, msb) {
-        const pitchBend = (msb * 128 + lsb - 8192) / 8192;
-        this.channels[channelNumber].pitchBend = pitchBend;
+    handlePitchBendMessage(channelNumber, lsb, msb) {
+        const pitchBend = msb * 128 + lsb;
+        this.handlePitchBend(channelNumber, pitchBend);
+    }
+    handlePitchBend(channelNumber, pitchBend) {
+        const now = this.audioContext.currentTime;
+        const channel = this.channels[channelNumber];
+        channel.pitchBend = (pitchBend - 8192) / 8192;
+        const semitoneOffset = this.calcSemitoneOffset(channel);
+        const activeNotes = this.getActiveNotes(channel);
+        activeNotes.forEach((activeNote) => {
+            const { bufferSource, noteInfo, noteNumber } = activeNote;
+            const playbackRate = calcPlaybackRate(noteInfo, noteNumber, semitoneOffset);
+            bufferSource.playbackRate
+                .cancelScheduledValues(now)
+                .setValueAtTime(playbackRate * pressure, now);
+        });
     }
     handleControlChange(channelNumber, controller, value) {
         switch (controller) {
@@ -1243,10 +1287,10 @@ class Midy {
                 switch (data[3]) {
                     // case 1:
                     //   // TODO
-                    //   return this.handleChannelPressure();
+                    //   return this.setChannelPressure();
                     // case 3:
                     //   // TODO
-                    //   return this.handleControlChange();
+                    //   return this.setControlChange();
                     default:
                         console.warn(`Unsupported Exclusive Message ${data}`);
                 }
@@ -1265,20 +1309,25 @@ class Midy {
         }
     }
     handleMasterVolumeSysEx(data) {
-        const volume = (data[5] * 128 + data[4] - 8192) / 8192;
+        const volume = (data[5] * 128 + data[4]) / 16383;
         this.handleMasterVolume(volume);
     }
     handleMasterVolume(volume) {
-        const now = this.audioContext.currentTime;
-        this.masterGain.gain.cancelScheduledValues(now);
-        this.masterGain.gain.setValueAtTime(volume * volume, now);
+        if (volume < 0 && 1 < volume) {
+            console.error("Master Volume is out of range");
+        }
+        else {
+            const now = this.audioContext.currentTime;
+            this.masterGain.gain.cancelScheduledValues(now);
+            this.masterGain.gain.setValueAtTime(volume * volume, now);
+        }
     }
     handleMasterFineTuningSysEx(data) {
         const fineTuning = (data[5] * 128 + data[4] - 8192) / 8192;
         this.handleMasterFineTuning(fineTuning);
     }
     handleMasterFineTuning(fineTuning) {
-        if (fineTuning < 0 && 1 < fineTuning) {
+        if (fineTuning < -1 && 1 < fineTuning) {
             console.error("Master Fine Tuning value is out of range");
         }
         else {
@@ -1366,3 +1415,16 @@ Object.defineProperty(Midy, "effectSettings", {
         pitchBendRange: 2,
     }
 });
+Object.defineProperty(Midy, "controllerDestinationSettings", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: {
+        pitchControl: 0,
+        filterCutoffControl: 0,
+        amplitudeControl: 1,
+        lfoPitchDepth: 0,
+        lfoFilterDepth: 0,
+        lfoAmplitudeDepth: 0,
+    }
+});