@marmooo/midy 0.1.3 → 0.1.5

package/script/midy-GM2.d.ts

@@ -92,6 +92,32 @@ export class MidyGM2 {
         };
     };
     masterGain: any;
+    controlChangeHandlers: {
+        0: (channelNumber: any, msb: any) => void;
+        1: (channelNumber: any, modulation: any) => void;
+        5: (channelNumber: any, portamentoTime: any) => void;
+        6: (channelNumber: any, value: any) => void;
+        7: (channelNumber: any, volume: any) => void;
+        10: (channelNumber: any, pan: any) => void;
+        11: (channelNumber: any, expression: any) => void;
+        32: (channelNumber: any, lsb: any) => void;
+        38: (channelNumber: any, value: any) => void;
+        64: (channelNumber: any, value: any) => void;
+        65: (channelNumber: any, value: any) => void;
+        66: (channelNumber: any, value: any) => void;
+        67: (channelNumber: any, softPedal: any) => void;
+        91: (channelNumber: any, reverbSendLevel: any) => void;
+        93: (channelNumber: any, chorusSendLevel: any) => void;
+        100: (channelNumber: any, value: any) => void;
+        101: (channelNumber: any, value: any) => void;
+        120: (channelNumber: any) => Promise<void>;
+        121: (channelNumber: any) => void;
+        123: (channelNumber: any) => Promise<void>;
+        124: () => void;
+        125: () => void;
+        126: () => void;
+        127: () => void;
+    };
     channels: any[];
     reverbEffect: {
         input: any;
@@ -167,14 +193,15 @@ export class MidyGM2 {
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
     setVolumeEnvelope(note: any): void;
     setPitch(note: any, semitoneOffset: any): void;
-    setFilterNode(channel: any, note: any): void;
+    clampCutoffFrequency(frequency: any): number;
+    setFilterEnvelope(channel: any, note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     startVibrato(channel: any, note: any, startTime: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     calcBank(channel: any, channelNumber: any): any;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
-    scheduleNoteRelease(channelNumber: any, noteNumber: any, velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
+    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any): any[];
@@ -183,7 +210,33 @@ export class MidyGM2 {
     handleChannelPressure(channelNumber: any, pressure: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, pitchBend: any): void;
-    handleControlChange(channelNumber: any, controller: any, value: any): void | Promise<void>;
+    createControlChangeHandlers(): {
+        0: (channelNumber: any, msb: any) => void;
+        1: (channelNumber: any, modulation: any) => void;
+        5: (channelNumber: any, portamentoTime: any) => void;
+        6: (channelNumber: any, value: any) => void;
+        7: (channelNumber: any, volume: any) => void;
+        10: (channelNumber: any, pan: any) => void;
+        11: (channelNumber: any, expression: any) => void;
+        32: (channelNumber: any, lsb: any) => void;
+        38: (channelNumber: any, value: any) => void;
+        64: (channelNumber: any, value: any) => void;
+        65: (channelNumber: any, value: any) => void;
+        66: (channelNumber: any, value: any) => void;
+        67: (channelNumber: any, softPedal: any) => void;
+        91: (channelNumber: any, reverbSendLevel: any) => void;
+        93: (channelNumber: any, chorusSendLevel: any) => void;
+        100: (channelNumber: any, value: any) => void;
+        101: (channelNumber: any, value: any) => void;
+        120: (channelNumber: any) => Promise<void>;
+        121: (channelNumber: any) => void;
+        123: (channelNumber: any) => Promise<void>;
+        124: () => void;
+        125: () => void;
+        126: () => void;
+        127: () => void;
+    };
+    handleControlChange(channelNumber: any, controller: any, value: any): void;
     setBankMSB(channelNumber: any, msb: any): void;
     updateModulation(channel: any): void;
     setModulationDepth(channelNumber: any, modulation: any): void;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidyGM2 = void 0;
 const _esm_js_1 = require("./deps/cdn.jsdelivr.net/npm/midi-file@1.2.4/+esm.js");
-const _esm_js_2 = require("./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.4/+esm.js");
+const _esm_js_2 = require("./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.6/+esm.js");
 class Note {
     constructor(noteNumber, velocity, startTime, instrumentKey) {
         Object.defineProperty(this, "bufferSource", {
@@ -233,6 +233,7 @@ class MidyGM2 {
         this.audioContext = audioContext;
         this.options = { ...this.defaultOptions, ...options };
         this.masterGain = new GainNode(audioContext);
+        this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
         this.reverbEffect = this.options.reverbAlgorithm(audioContext);
         this.chorusEffect = this.createChorusEffect(audioContext);
@@ -548,12 +549,13 @@ class MidyGM2 {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.scheduledNotes.forEach((noteList) => {
-            noteList.forEach((note) => {
-                if (note) {
-                    const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
-                    this.notePromises.push(promise);
-                }
-            });
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
+                this.notePromises.push(promise);
+            }
         });
         channel.scheduledNotes.clear();
         await Promise.all(this.notePromises);
@@ -776,7 +778,6 @@ class MidyGM2 {
     }
     setVolumeEnvelope(note) {
         const { instrumentKey, startTime } = note;
-        note.volumeNode = new GainNode(this.audioContext, { gain: 0 });
         const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation);
         const sustainVolume = attackVolume * (1 - instrumentKey.volSustain);
         const volDelay = startTime + instrumentKey.volDelay;
@@ -784,6 +785,8 @@ class MidyGM2 {
         const volHold = volAttack + instrumentKey.volHold;
         const volDecay = volHold + instrumentKey.volDecay;
         note.volumeNode.gain
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(0, startTime)
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
@@ -807,29 +810,30 @@ class MidyGM2 {
             .setValueAtTime(peekPitch, modHold)
             .linearRampToValueAtTime(basePitch, modDecay);
     }
-    setFilterNode(channel, note) {
+    clampCutoffFrequency(frequency) {
+        const minFrequency = 20; // min Hz of initialFilterFc
+        const maxFrequency = 20000; // max Hz of initialFilterFc
+        return Math.max(minFrequency, Math.min(frequency, maxFrequency));
+    }
+    setFilterEnvelope(channel, note) {
         const { instrumentKey, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
-        const maxFreq = this.audioContext.sampleRate / 2;
         const baseFreq = this.centToHz(instrumentKey.initialFilterFc) *
             softPedalFactor;
         const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
         const sustainFreq = baseFreq +
             (peekFreq - baseFreq) * (1 - instrumentKey.modSustain);
-        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
-        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
+        const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
+        const adjustedPeekFreq = this.clampCutoffFrequency(peekFreq);
+        const adjustedSustainFreq = this.clampCutoffFrequency(sustainFreq);
         const modDelay = startTime + instrumentKey.modDelay;
         const modAttack = modDelay + instrumentKey.modAttack;
         const modHold = modAttack + instrumentKey.modHold;
         const modDecay = modHold + instrumentKey.modDecay;
-        note.filterNode = new BiquadFilterNode(this.audioContext, {
-            type: "lowpass",
-            Q: instrumentKey.initialFilterQ / 10, // dB
-            frequency: adjustedBaseFreq,
-        });
         note.filterNode.frequency
+            .cancelScheduledValues(startTime)
+            .setValueAtTime(adjustedBaseFreq, startTime)
             .setValueAtTime(adjustedBaseFreq, modDelay)
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
@@ -882,8 +886,13 @@ class MidyGM2 {
         const semitoneOffset = this.calcSemitoneOffset(channel);
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
-        this.setFilterNode(channel, note);
+        note.volumeNode = new GainNode(this.audioContext);
+        note.filterNode = new BiquadFilterNode(this.audioContext, {
+            type: "lowpass",
+            Q: instrumentKey.initialFilterQ / 10 * channel.filterResonance, // dB
+        });
         this.setVolumeEnvelope(note);
+        this.setFilterEnvelope(channel, note);
         if (0 < channel.vibratoDepth) {
             this.startVibrato(channel, note, startTime);
         }
@@ -920,7 +929,7 @@ class MidyGM2 {
             return;
         const soundFont = this.soundFonts[soundFontIndex];
         const isSF3 = soundFont.parsed.info.version.major === 3;
-        const instrumentKey = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber);
+        const instrumentKey = soundFont.getInstrumentKey(bankNumber, channel.program, noteNumber, velocity);
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
@@ -941,12 +950,14 @@ class MidyGM2 {
         const now = this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, now);
     }
-    scheduleNoteRelease(channelNumber, noteNumber, velocity, stopTime, stopPedal = false) {
+    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, stopPedal = false) {
         const channel = this.channels[channelNumber];
-        if (stopPedal && channel.sustainPedal)
-            return;
-        if (stopPedal && channel.sostenutoNotes.has(noteNumber))
-            return;
+        if (stopPedal) {
+            if (channel.sustainPedal)
+                return;
+            if (channel.sostenutoNotes.has(noteNumber))
+                return;
+        }
         if (!channel.scheduledNotes.has(noteNumber))
             return;
         const scheduledNotes = channel.scheduledNotes.get(noteNumber);
@@ -956,14 +967,11 @@ class MidyGM2 {
                 continue;
             if (note.ending)
                 continue;
-            const velocityRate = (velocity + 127) / 127;
-            const volEndTime = stopTime +
-                note.instrumentKey.volRelease * velocityRate;
+            const volEndTime = stopTime + note.instrumentKey.volRelease;
             note.volumeNode.gain
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, volEndTime);
-            const modRelease = stopTime +
-                note.instrumentKey.modRelease * velocityRate;
+            const modRelease = stopTime + note.instrumentKey.modRelease;
             note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, modRelease);
@@ -977,16 +985,11 @@ class MidyGM2 {
                     note.bufferSource.disconnect();
                     note.volumeNode.disconnect();
                     note.filterNode.disconnect();
-                    if (note.volumeDepth)
+                    if (note.modulationDepth) {
                         note.volumeDepth.disconnect();
-                    if (note.modulationDepth)
                         note.modulationDepth.disconnect();
-                    if (note.modulationLFO)
                         note.modulationLFO.stop();
-                    if (note.vibratoDepth)
-                        note.vibratoDepth.disconnect();
-                    if (note.vibratoLFO)
-                        note.vibratoLFO.stop();
+                    }
                     resolve();
                 };
                 note.bufferSource.stop(volEndTime);
@@ -1003,13 +1006,14 @@ class MidyGM2 {
         const promises = [];
         channel.sustainPedal = false;
         channel.scheduledNotes.forEach((noteList) => {
-            noteList.forEach((note) => {
-                if (note) {
-                    const { noteNumber } = note;
-                    const promise = this.releaseNote(channelNumber, noteNumber, velocity);
-                    promises.push(promise);
-                }
-            });
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const { noteNumber } = note;
+                const promise = this.releaseNote(channelNumber, noteNumber, velocity);
+                promises.push(promise);
+            }
         });
         return promises;
     }
@@ -1078,58 +1082,41 @@ class MidyGM2 {
             channel.pitchBendRange * 100;
         this.updateDetune(channel, detuneChange);
     }
+    createControlChangeHandlers() {
+        return {
+            0: this.setBankMSB,
+            1: this.setModulationDepth,
+            5: this.setPortamentoTime,
+            6: this.dataEntryMSB,
+            7: this.setVolume,
+            10: this.setPan,
+            11: this.setExpression,
+            32: this.setBankLSB,
+            38: this.dataEntryLSB,
+            64: this.setSustainPedal,
+            65: this.setPortamento,
+            66: this.setSostenutoPedal,
+            67: this.setSoftPedal,
+            91: this.setReverbSendLevel,
+            93: this.setChorusSendLevel,
+            100: this.setRPNLSB,
+            101: this.setRPNMSB,
+            120: this.allSoundOff,
+            121: this.resetAllControllers,
+            123: this.allNotesOff,
+            124: this.omniOff,
+            125: this.omniOn,
+            126: this.monoOn,
+            127: this.polyOn,
+        };
+    }
     handleControlChange(channelNumber, controller, value) {
-        switch (controller) {
-            case 0:
-                return this.setBankMSB(channelNumber, value);
-            case 1:
-                return this.setModulationDepth(channelNumber, value);
-            case 5:
-                return this.setPortamentoTime(channelNumber, value);
-            case 6:
-                return this.dataEntryMSB(channelNumber, value);
-            case 7:
-                return this.setVolume(channelNumber, value);
-            case 10:
-                return this.setPan(channelNumber, value);
-            case 11:
-                return this.setExpression(channelNumber, value);
-            case 32:
-                return this.setBankLSB(channelNumber, value);
-            case 38:
-                return this.dataEntryLSB(channelNumber, value);
-            case 64:
-                return this.setSustainPedal(channelNumber, value);
-            case 65:
-                return this.setPortamento(channelNumber, value);
-            case 66:
-                return this.setSostenutoPedal(channelNumber, value);
-            case 67:
-                return this.setSoftPedal(channelNumber, value);
-            case 91:
-                return this.setReverbSendLevel(channelNumber, value);
-            case 93:
-                return this.setChorusSendLevel(channelNumber, value);
-            case 100:
-                return this.setRPNLSB(channelNumber, value);
-            case 101:
-                return this.setRPNMSB(channelNumber, value);
-            case 120:
-                return this.allSoundOff(channelNumber);
-            case 121:
-                return this.resetAllControllers(channelNumber);
-            case 123:
-                return this.allNotesOff(channelNumber);
-            case 124:
-                return this.omniOff();
-            case 125:
-                return this.omniOn();
-            case 126:
-                return this.monoOn();
-            case 127:
-                return this.polyOn();
-            default:
-                console.warn(`Unsupported Control change: controller=${controller} value=${value}`);
+        const handler = this.controlChangeHandlers[controller];
+        if (handler) {
+            handler.call(this, channelNumber, value);
+        }
+        else {
+            console.warn(`Unsupported Control change: controller=${controller} value=${value}`);
         }
     }
     setBankMSB(channelNumber, msb) {
@@ -1137,15 +1124,19 @@ class MidyGM2 {
     }
     updateModulation(channel) {
         const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            if (activeNote.modulationDepth) {
-                activeNote.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
-            }
-            else {
-                const semitoneOffset = this.calcSemitoneOffset(channel);
-                this.setPitch(activeNote, semitoneOffset);
-                this.startModulation(channel, activeNote, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                if (note.modulationDepth) {
+                    note.modulationDepth.gain.setValueAtTime(channel.modulationDepth, now);
+                }
+                else {
+                    const semitoneOffset = this.calcSemitoneOffset(channel);
+                    this.setPitch(note, semitoneOffset);
+                    this.startModulation(channel, note, now);
+                }
             }
         });
     }
@@ -1210,28 +1201,49 @@ class MidyGM2 {
     }
     setReverbSendLevel(channelNumber, reverbSendLevel) {
         const channel = this.channels[channelNumber];
-        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);
+        if (0 < channel.reverbSendLevel) {
+            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 {
+                channel.merger.disconnect(reverbEffect.input);
+            }
         }
-        else if (channel.reverbSendLevel !== 0) {
-            channel.merger.disconnect(reverbEffect.input);
+        else {
+            if (0 < reverbSendLevel) {
+                channel.merger.connect(reverbEffect.input);
+                const now = this.audioContext.currentTime;
+                channel.reverbSendLevel = reverbSendLevel / 127;
+                reverbEffect.output.gain.cancelScheduledValues(now);
+                reverbEffect.output.gain.setValueAtTime(channel.reverbSendLevel, now);
+            }
         }
     }
     setChorusSendLevel(channelNumber, chorusSendLevel) {
         const channel = this.channels[channelNumber];
         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);
+        if (0 < channel.chorusSendLevel) {
+            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 {
+                channel.merger.disconnect(chorusEffect.input);
+            }
         }
-        else if (channel.chorusSendLevel !== 0) {
-            channel.merger.disconnect(chorusEffect.input);
+        else {
+            if (0 < chorusSendLevel) {
+                channel.merger.connect(chorusEffect.input);
+                const now = this.audioContext.currentTime;
+                channel.chorusSendLevel = chorusSendLevel / 127;
+                chorusEffect.output.gain.cancelScheduledValues(now);
+                chorusEffect.output.gain.setValueAtTime(channel.chorusSendLevel, now);
+            }
         }
     }
     setSostenutoPedal(channelNumber, value) {
@@ -1309,13 +1321,17 @@ class MidyGM2 {
     }
     updateDetune(channel, detuneChange) {
         const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            const { bufferSource } = activeNote;
-            const detune = bufferSource.detune.value + detuneChange;
-            bufferSource.detune
-                .cancelScheduledValues(now)
-                .setValueAtTime(detune, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                const { bufferSource } = note;
+                const detune = bufferSource.detune.value + detuneChange;
+                bufferSource.detune
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(detune, now);
+            }
         });
     }
     handlePitchBendRangeRPN(channelNumber) {

package/script/midy-GMLite.d.ts

@@ -37,6 +37,20 @@ export class MidyGMLite {
     notePromises: any[];
     audioContext: any;
     masterGain: any;
+    controlChangeHandlers: {
+        1: (channelNumber: any, modulation: any) => void;
+        6: (channelNumber: any, value: any) => void;
+        7: (channelNumber: any, volume: any) => void;
+        10: (channelNumber: any, pan: any) => void;
+        11: (channelNumber: any, expression: any) => void;
+        38: (channelNumber: any, value: any) => void;
+        64: (channelNumber: any, value: any) => void;
+        100: (channelNumber: any, value: any) => void;
+        101: (channelNumber: any, value: any) => void;
+        120: (channelNumber: any) => Promise<void>;
+        121: (channelNumber: any) => void;
+        123: (channelNumber: any) => Promise<void>;
+    };
     channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
@@ -77,19 +91,34 @@ export class MidyGMLite {
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
     setVolumeEnvelope(note: any): void;
     setPitch(note: any, semitoneOffset: any): void;
-    setFilterNode(channel: any, note: any): void;
+    clampCutoffFrequency(frequency: any): number;
+    setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
-    scheduleNoteRelease(channelNumber: any, noteNumber: any, velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
+    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, pitchBend: any): void;
-    handleControlChange(channelNumber: any, controller: any, value: any): void | Promise<void>;
+    createControlChangeHandlers(): {
+        1: (channelNumber: any, modulation: any) => void;
+        6: (channelNumber: any, value: any) => void;
+        7: (channelNumber: any, volume: any) => void;
+        10: (channelNumber: any, pan: any) => void;
+        11: (channelNumber: any, expression: any) => void;
+        38: (channelNumber: any, value: any) => void;
+        64: (channelNumber: any, value: any) => void;
+        100: (channelNumber: any, value: any) => void;
+        101: (channelNumber: any, value: any) => void;
+        120: (channelNumber: any) => Promise<void>;
+        121: (channelNumber: any) => void;
+        123: (channelNumber: any) => Promise<void>;
+    };
+    handleControlChange(channelNumber: any, controller: any, value: any): void;
     updateModulation(channel: any): void;
     setModulationDepth(channelNumber: any, modulation: any): void;
     setVolume(channelNumber: any, volume: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAsBA;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,mFAmBC;IAED,yDAKC;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,+CAwBC;IAED,6CA6BC;IAED,+DA0BC;IAED,wHA8BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,2FA+BC;IAED,qCAeC;IAED,8DAIC;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,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA1+BD;IAQE,gFAKC;IAZD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAsBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAOC;IA7CD,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;;;;;;;;;;;;;MAA+D;IAC/D,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,mFAmBC;IAED,yDAKC;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,mCAeC;IAED,+CAwBC;IAED,6CAIC;IAED,mCAsBC;IAED,+DA0BC;IAED,wHAmCC;IAED,kGA8BC;IAED,0EAGC;IAED,uIA2CC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED;;;;;;;;;;;;;MAeC;IAED,2EASC;IAED,qCAkBC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAaC;IAED,kDAKC;IAED,iEAOC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAj/BD;IAQE,gFAKC;IAZD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}