@marmooo/midy 0.1.1 → 0.1.3

package/script/midy-GM1.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidyGM1 = 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.2/+esm.js");
+const _esm_js_2 = require("./deps/cdn.jsdelivr.net/npm/@marmooo/soundfont-parser@0.0.4/+esm.js");
 class Note {
     constructor(noteNumber, velocity, startTime, instrumentKey) {
         Object.defineProperty(this, "bufferSource", {
@@ -11,25 +11,43 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "gainNode", {
+        Object.defineProperty(this, "filterNode", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "filterNode", {
+        Object.defineProperty(this, "volumeNode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "volumeDepth", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "modulationLFO", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "modulationDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modLFO", {
+        Object.defineProperty(this, "vibratoLFO", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modLFOGain", {
+        Object.defineProperty(this, "vibratoDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -147,8 +165,8 @@ class MidyGM1 {
         });
         this.audioContext = audioContext;
         this.masterGain = new GainNode(audioContext);
-        this.masterGain.connect(audioContext.destination);
         this.channels = this.createChannels(audioContext);
+        this.masterGain.connect(audioContext.destination);
         this.GM1SystemOn();
     }
     initSoundFontTable() {
@@ -192,6 +210,7 @@ class MidyGM1 {
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
         gainL.connect(merger, 0, 0);
         gainR.connect(merger, 0, 1);
+        merger.connect(this.masterGain);
         return {
             gainL,
             gainR,
@@ -315,7 +334,7 @@ class MidyGM1 {
                 const t = this.audioContext.currentTime + offset;
                 queueIndex = await this.scheduleTimelineEvents(t, offset, queueIndex);
                 if (this.isPausing) {
-                    await this.stopNotes();
+                    await this.stopNotes(0, true);
                     this.notePromises = [];
                     resolve();
                     this.isPausing = false;
@@ -323,7 +342,7 @@ class MidyGM1 {
                     return;
                 }
                 else if (this.isStopping) {
-                    await this.stopNotes();
+                    await this.stopNotes(0, true);
                     this.notePromises = [];
                     resolve();
                     this.isStopping = false;
@@ -331,7 +350,7 @@ class MidyGM1 {
                     return;
                 }
                 else if (this.isSeeking) {
-                    this.stopNotes();
+                    this.stopNotes(0, true);
                     this.startTime = this.audioContext.currentTime;
                     queueIndex = this.getQueueIndex(this.resumeTime);
                     offset = this.resumeTime - this.startTime;
@@ -412,21 +431,24 @@ class MidyGM1 {
         }
         return { instruments, timeline };
     }
-    stopNotes() {
+    async stopChannelNotes(channelNumber, velocity, stopPedal) {
         const now = this.audioContext.currentTime;
-        const velocity = 0;
-        const stopPedal = true;
-        this.channels.forEach((channel, channelNumber) => {
-            channel.scheduledNotes.forEach((scheduledNotes) => {
-                scheduledNotes.forEach((scheduledNote) => {
-                    if (scheduledNote) {
-                        const promise = this.scheduleNoteRelease(channelNumber, scheduledNote.noteNumber, velocity, now, stopPedal);
-                        this.notePromises.push(promise);
-                    }
-                });
+        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);
+                }
             });
-            channel.scheduledNotes.clear();
         });
+        channel.scheduledNotes.clear();
+        await Promise.all(this.notePromises);
+    }
+    stopNotes(velocity, stopPedal) {
+        for (let i = 0; i < this.channels.length; i++) {
+            this.stopChannelNotes(i, velocity, stopPedal);
+        }
         return Promise.all(this.notePromises);
     }
     async start() {
@@ -494,10 +516,6 @@ class MidyGM1 {
         }
         return noteList[0];
     }
-    connectEffects(channel, gainNode) {
-        gainNode.connect(channel.merger);
-        merger.connect(this.masterGain);
-    }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
     }
@@ -512,27 +530,41 @@ class MidyGM1 {
         return instrumentKey.playbackRate(noteNumber) *
             Math.pow(2, semitoneOffset / 12);
     }
-    setVolumeEnvelope(channel, note) {
-        const { instrumentKey, startTime, velocity } = note;
-        note.gainNode = new GainNode(this.audioContext, { gain: 0 });
-        let volume = (velocity / 127) * channel.volume * channel.expression;
-        if (volume === 0)
-            volume = 1e-6; // exponentialRampToValueAtTime() requires a non-zero value
-        const attackVolume = this.cbToRatio(-instrumentKey.initialAttenuation) *
-            volume;
+    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;
         const volAttack = volDelay + instrumentKey.volAttack;
         const volHold = volAttack + instrumentKey.volHold;
         const volDecay = volHold + instrumentKey.volDecay;
-        note.gainNode.gain
+        note.volumeNode.gain
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
             .linearRampToValueAtTime(sustainVolume, volDecay);
     }
-    setFilterEnvelope(channel, note) {
-        const { instrumentKey, startTime, noteNumber } = note;
+    setPitch(note, semitoneOffset) {
+        const { instrumentKey, noteNumber, startTime } = note;
+        const modEnvToPitch = instrumentKey.modEnvToPitch / 100;
+        note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
+        if (modEnvToPitch === 0)
+            return;
+        const basePitch = note.bufferSource.playbackRate.value;
+        const peekPitch = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset + modEnvToPitch);
+        const modDelay = startTime + instrumentKey.modDelay;
+        const modAttack = modDelay + instrumentKey.modAttack;
+        const modHold = modAttack + instrumentKey.modHold;
+        const modDecay = modHold + instrumentKey.modDecay;
+        note.bufferSource.playbackRate.value
+            .setValueAtTime(basePitch, modDelay)
+            .exponentialRampToValueAtTime(peekPitch, modAttack)
+            .setValueAtTime(peekPitch, modHold)
+            .linearRampToValueAtTime(basePitch, modDecay);
+    }
+    setFilterNode(channel, note) {
+        const { instrumentKey, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
         const maxFreq = this.audioContext.sampleRate / 2;
@@ -541,13 +573,13 @@ class MidyGM1 {
         const peekFreq = this.centToHz(instrumentKey.initialFilterFc + instrumentKey.modEnvToFilterFc) * softPedalFactor;
         const sustainFreq = (baseFreq +
             (peekFreq - baseFreq) * (1 - instrumentKey.modSustain)) * softPedalFactor;
+        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
+        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
+        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
         const modDelay = startTime + instrumentKey.modDelay;
         const modAttack = modDelay + instrumentKey.modAttack;
         const modHold = modAttack + instrumentKey.modHold;
         const modDecay = modHold + instrumentKey.modDecay;
-        const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-        const adjustedPeekFreq = Math.min(maxFreq, peekFreq);
-        const adjustedSustainFreq = Math.min(maxFreq, sustainFreq);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
             Q: instrumentKey.initialFilterQ / 10, // dB
@@ -558,35 +590,49 @@ class MidyGM1 {
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
             .linearRampToValueAtTime(adjustedSustainFreq, modDecay);
-        note.bufferSource.detune.setValueAtTime(note.bufferSource.detune.value + instrumentKey.modEnvToPitch, modDelay);
     }
-    startModulation(channel, note, time) {
+    startModulation(channel, note, startTime) {
         const { instrumentKey } = note;
-        note.modLFOGain = new GainNode(this.audioContext, {
-            gain: this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation),
-        });
-        note.modLFO = new OscillatorNode(this.audioContext, {
+        const { modLfoToPitch, modLfoToVolume } = instrumentKey;
+        note.modulationLFO = new OscillatorNode(this.audioContext, {
             frequency: this.centToHz(instrumentKey.freqModLFO),
         });
-        note.modLFO.start(time);
-        note.filterNode.frequency.setValueAtTime(note.filterNode.frequency.value + instrumentKey.modLfoToFilterFc, time);
-        note.bufferSource.detune.setValueAtTime(note.bufferSource.detune.value + instrumentKey.modLfoToPitch, time);
-        note.modLFO.connect(note.modLFOGain);
-        note.modLFOGain.connect(note.bufferSource.detune);
+        note.filterDepth = new GainNode(this.audioContext, {
+            gain: instrumentKey.modLfoToFilterFc,
+        });
+        const modulationDepth = Math.abs(modLfoToPitch) + channel.modulationDepth;
+        const modulationDepthSign = (0 < modLfoToPitch) ? 1 : -1;
+        note.modulationDepth = new GainNode(this.audioContext, {
+            gain: modulationDepth * modulationDepthSign,
+        });
+        const volumeDepth = this.cbToRatio(Math.abs(modLfoToVolume)) - 1;
+        const volumeDepthSign = (0 < modLfoToVolume) ? 1 : -1;
+        note.volumeDepth = new GainNode(this.audioContext, {
+            gain: volumeDepth * volumeDepthSign,
+        });
+        note.modulationLFO.start(startTime + instrumentKey.delayModLFO);
+        note.modulationLFO.connect(note.filterDepth);
+        note.filterDepth.connect(note.filterNode.frequency);
+        note.modulationLFO.connect(note.modulationDepth);
+        note.modulationDepth.connect(note.bufferSource.detune);
+        note.modulationLFO.connect(note.volumeDepth);
+        note.volumeDepth.connect(note.volumeNode.gain);
     }
     async createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3) {
         const semitoneOffset = this.calcSemitoneOffset(channel);
         const note = new Note(noteNumber, velocity, startTime, instrumentKey);
         note.bufferSource = await this.createNoteBufferNode(instrumentKey, isSF3);
-        note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-        this.setVolumeEnvelope(channel, note);
-        this.setFilterEnvelope(channel, note);
-        if (channel.modulation > 0) {
-            const delayModLFO = startTime + instrumentKey.delayModLFO;
-            this.startModulation(channel, note, delayModLFO);
+        this.setFilterNode(channel, note);
+        this.setVolumeEnvelope(note);
+        if (0 < channel.modulationDepth) {
+            this.setPitch(note, semitoneOffset);
+            this.startModulation(channel, note, startTime);
+        }
+        else {
+            note.bufferSource.playbackRate.value = this.calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
         }
         note.bufferSource.connect(note.filterNode);
-        note.filterNode.connect(note.gainNode);
+        note.filterNode.connect(note.volumeNode);
         note.bufferSource.start(startTime, instrumentKey.start / instrumentKey.sampleRate);
         return note;
     }
@@ -602,7 +648,8 @@ class MidyGM1 {
         if (!instrumentKey)
             return;
         const note = await this.createNote(channel, instrumentKey, noteNumber, velocity, startTime, isSF3);
-        this.connectEffects(channel, note.gainNode);
+        note.volumeNode.connect(channel.gainL);
+        note.volumeNode.connect(channel.gainR);
         const scheduledNotes = channel.scheduledNotes;
         if (scheduledNotes.has(noteNumber)) {
             scheduledNotes.get(noteNumber).push(note);
@@ -631,17 +678,14 @@ class MidyGM1 {
             const velocityRate = (velocity + 127) / 127;
             const volEndTime = stopTime +
                 note.instrumentKey.volRelease * velocityRate;
-            note.gainNode.gain
+            note.volumeNode.gain
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, volEndTime);
-            const maxFreq = this.audioContext.sampleRate / 2;
-            const baseFreq = this.centToHz(note.instrumentKey.initialFilterFc);
-            const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-            const modEndTime = stopTime +
+            const modRelease = stopTime +
                 note.instrumentKey.modRelease * velocityRate;
             note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
-                .linearRampToValueAtTime(adjustedBaseFreq, modEndTime);
+                .linearRampToValueAtTime(0, modRelease);
             note.ending = true;
             this.scheduleTask(() => {
                 note.bufferSource.loop = false;
@@ -650,15 +694,17 @@ class MidyGM1 {
                 note.bufferSource.onended = () => {
                     scheduledNotes[i] = null;
                     note.bufferSource.disconnect();
+                    note.volumeNode.disconnect();
                     note.filterNode.disconnect();
-                    note.gainNode.disconnect();
-                    if (note.modLFOGain)
-                        note.modLFOGain.disconnect();
-                    if (note.modLFO)
-                        note.modLFO.stop();
+                    if (note.volumeDepth)
+                        note.volumeDepth.disconnect();
+                    if (note.modulationDepth)
+                        note.modulationDepth.disconnect();
+                    if (note.modulationLFO)
+                        note.modulationLFO.stop();
                     resolve();
                 };
-                bufferSource.stop(volEndTime);
+                note.bufferSource.stop(volEndTime);
             });
         }
     }
@@ -671,10 +717,10 @@ class MidyGM1 {
         const channel = this.channels[channelNumber];
         const promises = [];
         channel.sustainPedal = false;
-        channel.scheduledNotes.forEach((scheduledNotes) => {
-            scheduledNotes.forEach((scheduledNote) => {
-                if (scheduledNote) {
-                    const { noteNumber } = scheduledNote;
+        channel.scheduledNotes.forEach((noteList) => {
+            noteList.forEach((note) => {
+                if (note) {
+                    const { noteNumber } = note;
                     const promise = this.releaseNote(channelNumber, noteNumber, velocity);
                     promises.push(promise);
                 }
@@ -705,13 +751,13 @@ class MidyGM1 {
         channel.program = program;
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
-        const pitchBend = msb * 128 + lsb;
+        const pitchBend = msb * 128 + lsb - 8192;
         this.setPitchBend(channelNumber, pitchBend);
     }
     setPitchBend(channelNumber, pitchBend) {
         const channel = this.channels[channelNumber];
         const prevPitchBend = channel.pitchBend;
-        channel.pitchBend = (pitchBend - 8192) / 8192;
+        channel.pitchBend = pitchBend / 8192;
         const detuneChange = (channel.pitchBend - prevPitchBend) *
             channel.pitchBendRange * 100;
         this.updateDetune(channel, detuneChange);
@@ -719,7 +765,7 @@ class MidyGM1 {
     handleControlChange(channelNumber, controller, value) {
         switch (controller) {
             case 1:
-                return this.setModulation(channelNumber, value);
+                return this.setModulationDepth(channelNumber, value);
             case 6:
                 return this.dataEntryMSB(channelNumber, value);
             case 7:
@@ -750,18 +796,19 @@ class MidyGM1 {
         const now = this.audioContext.currentTime;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
-            if (activeNote.modLFO) {
-                const { gainNode, instrumentKey } = activeNote;
-                gainNode.gain.setValueAtTime(this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation), now);
+            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);
             }
         });
     }
-    setModulation(channelNumber, modulation) {
+    setModulationDepth(channelNumber, modulation) {
         const channel = this.channels[channelNumber];
-        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        channel.modulationDepth = (modulation / 127) * channel.modulationDepthRange;
         this.updateModulation(channel);
     }
     setVolume(channelNumber, volume) {
@@ -913,37 +960,13 @@ class MidyGM1 {
         this.updateDetune(channel, detuneChange);
     }
     allSoundOff(channelNumber) {
-        const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const velocity = 0;
-        const stopPedal = true;
-        const promises = [];
-        channel.scheduledNotes.forEach((noteList) => {
-            const activeNote = this.getActiveNote(noteList, now);
-            if (activeNote) {
-                const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
-                promises.push(notePromise);
-            }
-        });
-        return promises;
+        return this.stopChannelNotes(channelNumber, 0, true);
     }
     resetAllControllers(channelNumber) {
         Object.assign(this.channels[channelNumber], this.effectSettings);
     }
     allNotesOff(channelNumber) {
-        const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const velocity = 0;
-        const stopPedal = false;
-        const promises = [];
-        channel.scheduledNotes.forEach((noteList) => {
-            const activeNote = this.getActiveNote(noteList, now);
-            if (activeNote) {
-                const notePromise = this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now, stopPedal);
-                promises.push(notePromise);
-            }
-        });
-        return promises;
+        return this.stopChannelNotes(channelNumber, 0, false);
     }
     handleUniversalNonRealTimeExclusiveMessage(data) {
         switch (data[2]) {
@@ -1039,7 +1062,7 @@ Object.defineProperty(MidyGM1, "channelSettings", {
         pitchBend: 0,
         fineTuning: 0, // cb
         coarseTuning: 0, // cb
-        modulationDepthRange: 0.5, // cb
+        modulationDepthRange: 50, // cent
     }
 });
 Object.defineProperty(MidyGM1, "effectSettings", {
@@ -1048,7 +1071,7 @@ Object.defineProperty(MidyGM1, "effectSettings", {
     writable: true,
     value: {
         expression: 1,
-        modulation: 0,
+        modulationDepth: 0,
         sustainPedal: false,
         rpnMSB: 127,
         rpnLSB: 127,

package/script/midy-GM2.d.ts

@@ -6,6 +6,9 @@ export class MidyGM2 {
         portamentoTime: number;
         reverbSendLevel: number;
         chorusSendLevel: number;
+        vibratoRate: number;
+        vibratoDepth: number;
+        vibratoDelay: number;
         bank: number;
         bankMSB: number;
         bankLSB: number;
@@ -19,7 +22,7 @@ export class MidyGM2 {
     };
     static effectSettings: {
         expression: number;
-        modulation: number;
+        modulationDepth: number;
         sustainPedal: boolean;
         portamento: boolean;
         sostenutoPedal: boolean;
@@ -90,6 +93,19 @@ export class MidyGM2 {
     };
     masterGain: any;
     channels: any[];
+    reverbEffect: {
+        input: any;
+        output: any;
+    };
+    chorusEffect: {
+        input: any;
+        output: any;
+        sendGain: any;
+        lfo: any;
+        lfoGain: any;
+        delayNodes: any[];
+        feedbackGains: any[];
+    };
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     loadSoundFont(soundFontUrl: any): Promise<void>;
@@ -98,19 +114,6 @@ export class MidyGM2 {
         gainL: any;
         gainR: any;
         merger: any;
-        reverbEffect: {
-            input: any;
-            output: any;
-        };
-        chorusEffect: {
-            input: any;
-            output: any;
-            sendGain: any;
-            lfo: any;
-            lfoGain: any;
-            delayNodes: any[];
-            feedbackGains: any[];
-        };
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
@@ -125,7 +128,8 @@ export class MidyGM2 {
         instruments: Set<any>;
         timeline: any[];
     };
-    stopNotes(): Promise<any[]>;
+    stopChannelNotes(channelNumber: any, velocity: any, stopPedal: any): Promise<void>;
+    stopNotes(velocity: any, stopPedal: any): Promise<any[]>;
     start(): Promise<void>;
     stop(): void;
     pause(): void;
@@ -144,7 +148,7 @@ export class MidyGM2 {
     createCombFilter(audioContext: any, input: any, delay: any, feedback: any): any;
     createAllpassFilter(audioContext: any, input: any, delay: any, feedback: any): any;
     generateDistributedArray(center: any, count: any, varianceRatio?: number, randomness?: number): any[];
-    createSchroederReverb(audioContext: any, combDelays: any, combFeedbacks: any, allpassDelays: any, allpassFeedbacks: any): {
+    createSchroederReverb(audioContext: any, combFeedbacks: any, combDelays: any, allpassFeedbacks: any, allpassDelays: any): {
         input: any;
         output: any;
     };
@@ -157,14 +161,15 @@ export class MidyGM2 {
         delayNodes: any[];
         feedbackGains: any[];
     };
-    connectEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
-    setVolumeEnvelope(channel: any, note: any): void;
-    setFilterEnvelope(channel: any, note: any): void;
-    startModulation(channel: any, note: any, time: any): void;
+    setVolumeEnvelope(note: any): void;
+    setPitch(note: any, semitoneOffset: any): void;
+    setFilterNode(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>;
@@ -173,15 +178,15 @@ export class MidyGM2 {
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any): any[];
-    handleMIDIMessage(statusByte: any, data1: any, data2: any): void | any[] | Promise<any>;
+    handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
     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 | any[];
+    handleControlChange(channelNumber: any, controller: any, value: any): void | Promise<void>;
     setBankMSB(channelNumber: any, msb: any): void;
     updateModulation(channel: any): void;
-    setModulation(channelNumber: any, modulation: any): void;
+    setModulationDepth(channelNumber: any, modulation: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
     setVolume(channelNumber: any, volume: any): void;
     panToGain(pan: any): {
@@ -214,9 +219,9 @@ export class MidyGM2 {
     setCoarseTuning(channelNumber: any, coarseTuning: any): void;
     handleModulationDepthRangeRPN(channelNumber: any): void;
     setModulationDepthRange(channelNumber: any, modulationDepthRange: any): void;
-    allSoundOff(channelNumber: any): any[];
+    allSoundOff(channelNumber: any): Promise<void>;
     resetAllControllers(channelNumber: any): void;
-    allNotesOff(channelNumber: any): any[];
+    allNotesOff(channelNumber: any): Promise<void>;
     omniOff(): void;
     omniOn(): void;
     monoOn(): void;
@@ -256,12 +261,13 @@ export class MidyGM2 {
 declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, instrumentKey: any);
     bufferSource: any;
-    gainNode: any;
     filterNode: any;
-    modLFO: any;
-    modLFOGain: any;
-    vibLFO: any;
-    vibLFOGain: any;
+    volumeNode: any;
+    volumeDepth: any;
+    modulationLFO: any;
+    modulationDepth: any;
+    vibratoLFO: any;
+    vibratoDepth: any;
     noteNumber: any;
     velocity: any;
     startTime: any;

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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"}