@marmooo/midy 0.0.3 → 0.0.4

package/esm/midy-GMLite.js

@@ -223,9 +223,6 @@ export class MidyGMLite {
             if (event.startTime > t + this.lookAhead)
                 break;
             switch (event.type) {
-                case "controller":
-                    this.handleControlChange(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);
@@ -239,9 +236,15 @@ export class MidyGMLite {
                     }
                     break;
                 }
+                case "controller":
+                    this.handleControlChange(event.channel, event.controllerType, event.value);
+                    break;
                 case "programChange":
                     this.handleProgramChange(event.channel, event.programNumber);
                     break;
+                case "pitchBend":
+                    this.handlePitchBend(event.channel, event.value);
+                    break;
                 case "sysEx":
                     this.handleSysEx(event.data);
             }
@@ -478,12 +481,16 @@ export class MidyGMLite {
     centToHz(cent) {
         return 8.176 * Math.pow(2, cent / 1200);
     }
+    calcSemitoneOffset(channel) {
+        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 semitoneOffset = channel.pitchBend * channel.pitchBendRange;
-        const playbackRate = noteInfo.playbackRate(noteNumber) *
-            Math.pow(2, semitoneOffset / 12);
         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,
@@ -649,46 +656,37 @@ export class MidyGMLite {
                 return this.releaseNote(channelNumber, data1, data2);
             case 0x90:
                 return this.noteOn(channelNumber, data1, data2);
-            case 0xA0:
-                return this.handlePolyphonicKeyPressure(channelNumber, data1, data2);
             case 0xB0:
                 return this.handleControlChange(channelNumber, data1, data2);
             case 0xC0:
                 return this.handleProgramChange(channelNumber, data1);
-            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)}`);
         }
     }
-    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);
-                }
-            });
-        }
-    }
     handleProgramChange(channelNumber, program) {
         const channel = this.channels[channelNumber];
         channel.program = program;
     }
-    handleChannelPressure(channelNumber, pressure) {
-        this.channels[channelNumber].channelPressure = pressure;
+    handlePitchBendMessage(channelNumber, lsb, msb) {
+        const pitchBend = msb * 128 + lsb;
+        this.handlePitchBend(channelNumber, pitchBend);
     }
-    handlePitchBend(channelNumber, lsb, msb) {
-        const pitchBend = (msb * 128 + lsb - 8192) / 8192;
-        this.channels[channelNumber].pitchBend = 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) {
@@ -848,13 +846,18 @@ export class MidyGMLite {
         }
     }
     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);
+        }
     }
     handleExclusiveMessage(data) {
         console.warn(`Unsupported Exclusive Message ${data}`);

package/esm/midy.d.ts

@@ -32,6 +32,14 @@ export class Midy {
         channelPressure: number;
         pitchBendRange: number;
     };
+    static controllerDestinationSettings: {
+        pitchControl: number;
+        filterCutoffControl: number;
+        amplitudeControl: number;
+        lfoPitchDepth: number;
+        lfoFilterDepth: number;
+        lfoAmplitudeDepth: number;
+    };
     constructor(audioContext: any);
     ticksPerBeat: number;
     totalTime: number;
@@ -60,6 +68,22 @@ export class Midy {
     channels: {
         scheduledNotes: Map<any, any>;
         sostenutoNotes: Map<any, any>;
+        polyphonicKeyPressure: {
+            pitchControl: number;
+            filterCutoffControl: number;
+            amplitudeControl: number;
+            lfoPitchDepth: number;
+            lfoFilterDepth: number;
+            lfoAmplitudeDepth: number;
+        };
+        channelPressure: {
+            pitchControl: number;
+            filterCutoffControl: number;
+            amplitudeControl: number;
+            lfoPitchDepth: number;
+            lfoFilterDepth: number;
+            lfoAmplitudeDepth: number;
+        };
         gainNode: any;
         pannerNode: any;
         modulationEffect: {
@@ -84,7 +108,6 @@ export class Midy {
         softPedal: number;
         rpnMSB: number;
         rpnLSB: number;
-        channelPressure: number;
         pitchBendRange: number;
         currentBufferSource: null;
         volume: number;
@@ -131,6 +154,22 @@ export class Midy {
     createChannels(audioContext: any): {
         scheduledNotes: Map<any, any>;
         sostenutoNotes: Map<any, any>;
+        polyphonicKeyPressure: {
+            pitchControl: number;
+            filterCutoffControl: number;
+            amplitudeControl: number;
+            lfoPitchDepth: number;
+            lfoFilterDepth: number;
+            lfoAmplitudeDepth: number;
+        };
+        channelPressure: {
+            pitchControl: number;
+            filterCutoffControl: number;
+            amplitudeControl: number;
+            lfoPitchDepth: number;
+            lfoFilterDepth: number;
+            lfoAmplitudeDepth: number;
+        };
         gainNode: any;
         pannerNode: any;
         modulationEffect: {
@@ -155,7 +194,6 @@ export class Midy {
         softPedal: number;
         rpnMSB: number;
         rpnLSB: number;
-        channelPressure: number;
         pitchBendRange: number;
         currentBufferSource: null;
         volume: number;
@@ -216,10 +254,13 @@ export class Midy {
     connectNoteEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
+    calcSemitoneOffset(channel: any): any;
+    calcPlaybackRate(noteInfo: any, noteNumber: any, semitoneOffset: any): number;
     createNoteAudioChain(channel: any, noteInfo: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<{
         bufferSource: any;
         gainNode: any;
         filterNode: any;
+        lfoGain: any;
     }>;
     calcBank(channel: any, channelNumber: any): any;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
@@ -232,7 +273,8 @@ export class Midy {
     handlePolyphonicKeyPressure(channelNumber: any, noteNumber: any, pressure: any): void;
     handleProgramChange(channelNumber: any, program: any): void;
     handleChannelPressure(channelNumber: any, pressure: any): void;
-    handlePitchBend(channelNumber: any, lsb: any, msb: any): void;
+    handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
+    handlePitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): any;
     setBankMSB(channelNumber: any, msb: any): void;
     setModulation(channelNumber: any, modulation: any): void;

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAMA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF,+BAMC;IAhED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAsChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;;;;MAuBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EA4CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA2GC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;MAOC;IAED;;;;MAoCC;IAED;;;;;MA2CC;IAED,sDA2BC;IAED,2BAEC;IAED,4BAEC;IAED;;;;OAsFC;IAED,gDAQC;IAED,kGAgDC;IAED,0EAGC;IAED,sIA6CC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,gEAqBC;IAED,sFAeC;IAED,4DAIC;IAED,+DAEC;IAED,8DAGC;IAED,0EAkEC;IAED,+CAEC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,+CAEC;IAED,sCAKC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAUC;IAED,uDAGC;IAED,2DAOC;IAED,6DAOC;IAED,6DASC;IAED,4CAkBC;IAED,4CAkBC;IAED,gDAEC;IAED,gDAEC;IAGD,+DAuBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,sCAIC;IAED,6CAGC;IAED,8CAMC;IAED,+CAGC;IAED,kDAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAMA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAzED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA+ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;;;;MAuBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiBC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA2GC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;MAOC;IAED;;;;MAoCC;IAED;;;;;MA2CC;IAED,sDA2BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,8EAEC;IAED;;;;;OAqFC;IAED,gDAQC;IAED,kGAgDC;IAED,0EAGC;IAED,sIA6CC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,gEAqBC;IAED,sFAcC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,0DAiBC;IAED,0EAkEC;IAED,+CAEC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,+CAEC;IAED,sCAKC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAUC;IAED,uDAGC;IAED,2DAOC;IAED,6DAOC;IAED,6DASC;IAED,4CAkBC;IAED,4CAkBC;IAED,gDAEC;IAED,gDAEC;IAGD,+DAuBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,sCAQC;IAED,6CAGC;IAED,8CAMC;IAED,+CAGC;IAED,kDAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}

package/esm/midy.js

@@ -206,6 +206,12 @@ export class Midy {
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
+                polyphonicKeyPressure: {
+                    ...Midy.controllerDestinationSettings,
+                },
+                channelPressure: {
+                    ...Midy.controllerDestinationSettings,
+                },
             };
         });
         return channels;
@@ -260,9 +266,6 @@ export 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);
@@ -276,9 +279,21 @@ export 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);
             }
@@ -642,15 +657,19 @@ export 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,
@@ -714,7 +733,7 @@ export 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) {
@@ -736,7 +755,7 @@ export 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) {
@@ -856,7 +875,7 @@ export 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:
@@ -864,7 +883,7 @@ export 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)}`);
         }
@@ -872,17 +891,16 @@ export 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) {
@@ -891,11 +909,37 @@ export 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) {
@@ -1240,10 +1284,10 @@ export 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}`);
                 }
@@ -1262,20 +1306,25 @@ export 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 {
@@ -1362,3 +1411,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,
+    }
+});

package/package.json

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

@@ -137,6 +137,8 @@ export class MidyGM1 {
     connectNoteEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
+    calcSemitoneOffset(channel: any): any;
+    calcPlaybackRate(noteInfo: any, noteNumber: any, semitoneOffset: any): number;
     createNoteAudioChain(channel: any, noteInfo: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<{
         bufferSource: any;
         gainNode: any;
@@ -149,10 +151,9 @@ export class MidyGM1 {
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | any[] | Promise<any>;
-    handlePolyphonicKeyPressure(channelNumber: any, noteNumber: any, pressure: any): void;
     handleProgramChange(channelNumber: any, program: any): void;
-    handleChannelPressure(channelNumber: any, pressure: any): void;
-    handlePitchBend(channelNumber: any, lsb: any, msb: any): void;
+    handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
+    handlePitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
     setModulation(channelNumber: any, modulation: any): void;
     setVolume(channelNumber: any, volume: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAMA;IAmBE;;;;;;;;;;;;;;MAcE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAjDD,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;IA4BhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;MAgBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EA4CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAyEC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;MAOC;IAED,sDAEC;IAED,2BAEC;IAED,4BAEC;IAED;;;;;OA6EC;IAED,kGAuCC;IAED,0EAGC;IAED,sIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,wFAqBC;IAED,sFAeC;IAED,4DAGC;IAED,+DAEC;IAED,8DAGC;IAED,mFA+BC;IAED,yDAIC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,sCAKC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAoBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,sCAIC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAMA;IAmBE;;;;;;;;;;;;;;MAcE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAjDD,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;IA4BhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;MAgBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAyEC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;MAOC;IAED,sDAEC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,8EAEC;IAED;;;;;OA8EC;IAED,kGAuCC;IAED,0EAGC;IAED,sIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,wFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,0DAiBC;IAED,mFA+BC;IAED,yDAIC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,sCAKC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAoBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,sCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}

package/script/midy-GM1.js

@@ -226,9 +226,6 @@ class MidyGM1 {
             if (event.startTime > t + this.lookAhead)
                 break;
             switch (event.type) {
-                case "controller":
-                    this.handleControlChange(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);
@@ -242,9 +239,15 @@ class MidyGM1 {
                     }
                     break;
                 }
+                case "controller":
+                    this.handleControlChange(event.channel, event.controllerType, event.value);
+                    break;
                 case "programChange":
                     this.handleProgramChange(event.channel, event.programNumber);
                     break;
+                case "pitchBend":
+                    this.handlePitchBend(event.channel, event.value);
+                    break;
                 case "sysEx":
                     this.handleSysEx(event.data);
             }
@@ -481,13 +484,17 @@ class MidyGM1 {
     centToHz(cent) {
         return 8.176 * Math.pow(2, cent / 1200);
     }
-    async createNoteAudioChain(channel, noteInfo, noteNumber, velocity, startTime, isSF3) {
+    calcSemitoneOffset(channel) {
         const tuning = channel.coarseTuning + channel.fineTuning;
-        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,
@@ -653,46 +660,37 @@ class MidyGM1 {
                 return this.releaseNote(channelNumber, data1, data2);
             case 0x90:
                 return this.noteOn(channelNumber, data1, data2);
-            case 0xA0:
-                return this.handlePolyphonicKeyPressure(channelNumber, data1, data2);
             case 0xB0:
                 return this.handleControlChange(channelNumber, data1, data2);
             case 0xC0:
                 return this.handleProgramChange(channelNumber, data1);
-            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)}`);
         }
     }
-    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);
-                }
-            });
-        }
-    }
     handleProgramChange(channelNumber, program) {
         const channel = this.channels[channelNumber];
         channel.program = program;
     }
-    handleChannelPressure(channelNumber, pressure) {
-        this.channels[channelNumber].channelPressure = pressure;
+    handlePitchBendMessage(channelNumber, lsb, msb) {
+        const pitchBend = msb * 128 + lsb;
+        this.handlePitchBend(channelNumber, pitchBend);
     }
-    handlePitchBend(channelNumber, lsb, msb) {
-        const pitchBend = (msb * 128 + lsb - 8192) / 8192;
-        this.channels[channelNumber].pitchBend = 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) {
@@ -858,13 +856,18 @@ class MidyGM1 {
         }
     }
     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);
+        }
     }
     handleExclusiveMessage(data) {
         console.warn(`Unsupported Exclusive Message ${data}`);