@marmooo/midy 0.2.5 → 0.2.6

package/script/midy-GM1.d.ts

@@ -37,22 +37,22 @@ export class MidyGM1 {
     masterVolume: any;
     voiceParamsHandlers: {
         modLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
-        vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any) => void;
         modLfoToFilterFc: (channel: any, note: any, _prevValue: any) => void;
         modLfoToVolume: (channel: any, note: any, _prevValue: any) => void;
         chorusEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
         reverbEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
         delayModLFO: (_channel: any, note: any, _prevValue: any) => void;
         freqModLFO: (_channel: any, note: any, _prevValue: any) => void;
-        delayVibLFO: (channel: any, note: any, prevValue: any) => void;
-        freqVibLFO: (channel: any, note: any, _prevValue: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _prevValue: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _prevValue: any) => void;
     };
     controlChangeHandlers: {
-        1: (channelNumber: any, modulation: any) => void;
+        1: (channelNumber: any, modulation: any, scheduleTime: 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;
+        7: (channelNumber: any, volume: any, scheduleTime: any) => void;
+        10: (channelNumber: any, pan: any, scheduleTime: any) => void;
+        11: (channelNumber: any, expression: any, scheduleTime: any) => void;
         38: (channelNumber: any, value: any) => void;
         64: (channelNumber: any, value: any) => void;
         100: (channelNumber: any, value: any) => void;
@@ -93,6 +93,7 @@ export class MidyGM1 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
+    processScheduledNotes(channel: any, scheduleTime: any, callback: any): void;
     getActiveNotes(channel: any, time: any): SparseMap;
     getActiveNote(noteList: any, time: any): any;
     cbToRatio(cb: any): number;
@@ -103,7 +104,7 @@ export class MidyGM1 {
     updateChannelDetune(channel: any): void;
     updateDetune(channel: any, note: any): void;
     setVolumeEnvelope(note: any): void;
-    setPitchEnvelope(note: any): void;
+    setPitchEnvelope(note: any, scheduleTime: any): void;
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
@@ -120,31 +121,30 @@ export class MidyGM1 {
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
     setModLfoToPitch(channel: any, note: any): void;
-    setVibLfoToPitch(channel: any, note: any): void;
     setModLfoToFilterFc(note: any): void;
     setModLfoToVolume(note: any): void;
     setDelayModLFO(note: any): void;
     setFreqModLFO(note: any): void;
     createVoiceParamsHandlers(): {
         modLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
-        vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any) => void;
         modLfoToFilterFc: (channel: any, note: any, _prevValue: any) => void;
         modLfoToVolume: (channel: any, note: any, _prevValue: any) => void;
         chorusEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
         reverbEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
         delayModLFO: (_channel: any, note: any, _prevValue: any) => void;
         freqModLFO: (_channel: any, note: any, _prevValue: any) => void;
-        delayVibLFO: (channel: any, note: any, prevValue: any) => void;
-        freqVibLFO: (channel: any, note: any, _prevValue: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _prevValue: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _prevValue: any) => void;
     };
     getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any): void;
     createControlChangeHandlers(): {
-        1: (channelNumber: any, modulation: any) => void;
+        1: (channelNumber: any, modulation: any, scheduleTime: 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;
+        7: (channelNumber: any, volume: any, scheduleTime: any) => void;
+        10: (channelNumber: any, pan: any, scheduleTime: any) => void;
+        11: (channelNumber: any, expression: any, scheduleTime: any) => void;
         38: (channelNumber: any, value: any) => void;
         64: (channelNumber: any, value: any) => void;
         100: (channelNumber: any, value: any) => void;
@@ -153,18 +153,18 @@ export class MidyGM1 {
         121: (channelNumber: any) => void;
         123: (channelNumber: any) => Promise<void>;
     };
-    handleControlChange(channelNumber: any, controllerType: any, value: any): void;
-    updateModulation(channel: any): void;
-    setModulationDepth(channelNumber: any, modulation: any): void;
-    setVolume(channelNumber: any, volume: any): void;
+    handleControlChange(channelNumber: any, controllerType: any, value: any, startTime: any): void;
+    updateModulation(channel: any, scheduleTime: any): void;
+    setModulationDepth(channelNumber: any, modulation: any, scheduleTime: any): void;
+    setVolume(channelNumber: any, volume: any, scheduleTime: any): void;
     panToGain(pan: any): {
         gainLeft: number;
         gainRight: number;
     };
-    setPan(channelNumber: any, pan: any): void;
-    setExpression(channelNumber: any, expression: any): void;
+    setPan(channelNumber: any, pan: any, scheduleTime: any): void;
+    setExpression(channelNumber: any, expression: any, scheduleTime: any): void;
     dataEntryLSB(channelNumber: any, value: any): void;
-    updateChannelVolume(channel: any): void;
+    updateChannelVolume(channel: any, scheduleTime: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
     limitDataMSB(channel: any, minMSB: any, maxMSB: any): void;
@@ -207,12 +207,11 @@ declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;
     filterNode: any;
+    filterDepth: any;
     volumeEnvelopeNode: any;
     volumeDepth: any;
     modulationLFO: any;
     modulationDepth: any;
-    vibratoLFO: any;
-    vibratoDepth: any;
     noteNumber: any;
     velocity: any;
     startTime: any;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAkJA;IAsBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IA3CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,6BAAuC;IAiBrC,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,8DASC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,mDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,wCAQC;IAED,4CAKC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,yGAgBC;IAED,gHAuCC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAl6CD;IACE,uBAGC;IAFC,YAA2B;IAC3B,qBAAuB;IAGzB,gCAKC;IAED,mBAEC;IAED,0BAUC;IAED,uBAEC;IAED,mBAEC;IAED,cAMC;IASD,6BAKC;IAZD,qDAKC;CAQF;AAED;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAiJA;IAsBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IA3CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,6BAAuC;IAiBrC,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,8DASC;IAED,2EAqDC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4EASC;IAED,mDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,wCAQC;IAED,4CAKC;IAED,mCAgBC;IAED,qDAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,yGAgBC;IAED,gHAuCC;IAED,kGAgDC;IAED,0EAGC;IAED,qFAwBC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MAqBC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+FAWC;IAED,wDAWC;IAED,iFAIC;IAED,oEAIC;IAED;;;MAMC;IAED,8DAIC;IAED,4EAIC;IAED,mDAGC;IAED,2DAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAz4CD;IACE,uBAGC;IAFC,YAA2B;IAC3B,qBAAuB;IAGzB,gCAKC;IAED,mBAEC;IAED,0BAUC;IAED,uBAEC;IAED,mBAEC;IAED,cAMC;IASD,6BAKC;IAZD,qDAKC;CAQF;AAED;IASE,0FAMC;IAdD,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GM1.js

@@ -69,37 +69,31 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "volumeEnvelopeNode", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "volumeDepth", {
+        Object.defineProperty(this, "filterDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modulationLFO", {
+        Object.defineProperty(this, "volumeEnvelopeNode", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modulationDepth", {
+        Object.defineProperty(this, "volumeDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "vibratoLFO", {
+        Object.defineProperty(this, "modulationLFO", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "vibratoDepth", {
+        Object.defineProperty(this, "modulationDepth", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -412,31 +406,32 @@ class MidyGM1 {
             const event = this.timeline[queueIndex];
             if (event.startTime > t + this.lookAhead)
                 break;
+            const startTime = event.startTime + this.startDelay - offset;
             switch (event.type) {
                 case "noteOn":
                     if (event.velocity !== 0) {
-                        await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
+                        await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime);
                         break;
                     }
                 /* falls through */
                 case "noteOff": {
-                    const notePromise = this.scheduleNoteRelease(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
+                    const notePromise = this.scheduleNoteRelease(event.channel, event.noteNumber, event.velocity, startTime);
                     if (notePromise) {
                         this.notePromises.push(notePromise);
                     }
                     break;
                 }
                 case "controller":
-                    this.handleControlChange(event.channel, event.controllerType, event.value);
+                    this.handleControlChange(event.channel, event.controllerType, event.value, startTime);
                     break;
                 case "programChange":
-                    this.handleProgramChange(event.channel, event.programNumber);
+                    this.handleProgramChange(event.channel, event.programNumber, startTime);
                     break;
                 case "pitchBend":
-                    this.setPitchBend(event.channel, event.value + 8192);
+                    this.setPitchBend(event.channel, event.value + 8192, startTime);
                     break;
                 case "sysEx":
-                    this.handleSysEx(event.data);
+                    this.handleSysEx(event.data, startTime);
             }
             queueIndex++;
         }
@@ -646,6 +641,18 @@ class MidyGM1 {
         const now = this.audioContext.currentTime;
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
+    processScheduledNotes(channel, scheduleTime, callback) {
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                if (scheduleTime < note.startTime)
+                    continue;
+                callback(note);
+            }
+        });
+    }
     getActiveNotes(channel, time) {
         const activeNotes = new SparseMap(128);
         channel.scheduledNotes.forEach((noteList) => {
@@ -719,20 +726,20 @@ class MidyGM1 {
             .setValueAtTime(attackVolume, volHold)
             .linearRampToValueAtTime(sustainVolume, volDecay);
     }
-    setPitchEnvelope(note) {
-        const now = this.audioContext.currentTime;
+    setPitchEnvelope(note, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
         const { voiceParams } = note;
         const baseRate = voiceParams.playbackRate;
         note.bufferSource.playbackRate
-            .cancelScheduledValues(now)
-            .setValueAtTime(baseRate, now);
+            .cancelScheduledValues(scheduleTime)
+            .setValueAtTime(baseRate, scheduleTime);
         const modEnvToPitch = voiceParams.modEnvToPitch;
         if (modEnvToPitch === 0)
             return;
         const basePitch = this.rateToCent(baseRate);
         const peekPitch = basePitch + modEnvToPitch;
         const peekRate = this.centToRate(peekPitch);
-        const modDelay = startTime + voiceParams.modDelay;
+        const modDelay = note.startTime + voiceParams.modDelay;
         const modAttack = modDelay + voiceParams.modAttack;
         const modHold = modAttack + voiceParams.modHold;
         const modDecay = modHold + voiceParams.modDecay;
@@ -889,10 +896,6 @@ class MidyGM1 {
                     note.modulationDepth.disconnect();
                     note.modulationLFO.stop();
                 }
-                if (note.vibratoDepth) {
-                    note.vibratoDepth.disconnect();
-                    note.vibratoLFO.stop();
-                }
                 resolve();
             };
             note.bufferSource.stop(stopTime);
@@ -987,16 +990,6 @@ class MidyGM1 {
             .cancelScheduledValues(now)
             .setValueAtTime(modulationDepth, now);
     }
-    setVibLfoToPitch(channel, note) {
-        const now = this.audioContext.currentTime;
-        const vibLfoToPitch = note.voiceParams.vibLfoToPitch;
-        const vibratoDepth = Math.abs(vibLfoToPitch) * channel.state.vibratoDepth *
-            2;
-        const vibratoDepthSign = 0 < vibLfoToPitch;
-        note.vibratoDepth.gain
-            .cancelScheduledValues(now)
-            .setValueAtTime(vibratoDepth * vibratoDepthSign, now);
-    }
     setModLfoToFilterFc(note) {
         const now = this.audioContext.currentTime;
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
@@ -1036,11 +1029,7 @@ class MidyGM1 {
                     this.setModLfoToPitch(channel, note);
                 }
             },
-            vibLfoToPitch: (channel, note, _prevValue) => {
-                if (0 < channel.state.vibratoDepth) {
-                    this.setVibLfoToPitch(channel, note);
-                }
-            },
+            vibLfoToPitch: (_channel, _note, _prevValue) => { },
             modLfoToFilterFc: (channel, note, _prevValue) => {
                 if (0 < channel.state.modulationDepth)
                     this.setModLfoToFilterFc(note);
@@ -1053,28 +1042,8 @@ class MidyGM1 {
             reverbEffectsSend: (_channel, _note, _prevValue) => { },
             delayModLFO: (_channel, note, _prevValue) => this.setDelayModLFO(note),
             freqModLFO: (_channel, note, _prevValue) => this.setFreqModLFO(note),
-            delayVibLFO: (channel, note, prevValue) => {
-                if (0 < channel.state.vibratoDepth) {
-                    const now = this.audioContext.currentTime;
-                    const vibratoDelay = channel.state.vibratoDelay * 2;
-                    const prevStartTime = note.startTime + prevValue * vibratoDelay;
-                    if (now < prevStartTime)
-                        return;
-                    const value = note.voiceParams.delayVibLFO;
-                    const startTime = note.startTime + value * vibratoDelay;
-                    note.vibratoLFO.stop(now);
-                    note.vibratoLFO.start(startTime);
-                }
-            },
-            freqVibLFO: (channel, note, _prevValue) => {
-                if (0 < channel.state.vibratoDepth) {
-                    const now = this.audioContext.currentTime;
-                    const freqVibLFO = note.voiceParams.freqVibLFO;
-                    note.vibratoLFO.frequency
-                        .cancelScheduledValues(now)
-                        .setValueAtTime(freqVibLFO * channel.state.vibratoRate * 2, now);
-                }
-            },
+            delayVibLFO: (_channel, _note, _prevValue) => { },
+            freqVibLFO: (_channel, _note, _prevValue) => { },
         };
     }
     getControllerState(channel, noteNumber, velocity) {
@@ -1147,10 +1116,10 @@ class MidyGM1 {
             123: this.allNotesOff,
         };
     }
-    handleControlChange(channelNumber, controllerType, value) {
+    handleControlChange(channelNumber, controllerType, value, startTime) {
         const handler = this.controlChangeHandlers[controllerType];
         if (handler) {
-            handler.call(this, channelNumber, value);
+            handler.call(this, channelNumber, value, startTime);
             const channel = this.channels[channelNumber];
             this.applyVoiceParams(channel, controllerType + 128);
         }
@@ -1158,33 +1127,28 @@ class MidyGM1 {
             console.warn(`Unsupported Control change: controllerType=${controllerType} value=${value}`);
         }
     }
-    updateModulation(channel) {
-        const now = this.audioContext.currentTime;
+    updateModulation(channel, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
         const depth = channel.state.modulationDepth * channel.modulationDepthRange;
-        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(depth, now);
-                }
-                else {
-                    this.setPitchEnvelope(note);
-                    this.startModulation(channel, note, now);
-                }
+        this.processScheduledNotes(channel, scheduleTime, (note) => {
+            if (note.modulationDepth) {
+                note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
+            }
+            else {
+                this.setPitchEnvelope(note, scheduleTime);
+                this.startModulation(channel, note, scheduleTime);
             }
         });
     }
-    setModulationDepth(channelNumber, modulation) {
+    setModulationDepth(channelNumber, modulation, scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.state.modulationDepth = modulation / 127;
-        this.updateModulation(channel);
+        this.updateModulation(channel, scheduleTime);
     }
-    setVolume(channelNumber, volume) {
+    setVolume(channelNumber, volume, scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.state.volume = volume / 127;
-        this.updateChannelVolume(channel);
+        this.updateChannelVolume(channel, scheduleTime);
     }
     panToGain(pan) {
         const theta = Math.PI / 2 * Math.max(0, pan * 127 - 1) / 126;
@@ -1193,31 +1157,31 @@ class MidyGM1 {
             gainRight: Math.sin(theta),
         };
     }
-    setPan(channelNumber, pan) {
+    setPan(channelNumber, pan, scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.state.pan = pan / 127;
-        this.updateChannelVolume(channel);
+        this.updateChannelVolume(channel, scheduleTime);
     }
-    setExpression(channelNumber, expression) {
+    setExpression(channelNumber, expression, scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.state.expression = expression / 127;
-        this.updateChannelVolume(channel);
+        this.updateChannelVolume(channel, scheduleTime);
     }
     dataEntryLSB(channelNumber, value) {
         this.channels[channelNumber].dataLSB = value;
         this.handleRPN(channelNumber, 0);
     }
-    updateChannelVolume(channel) {
-        const now = this.audioContext.currentTime;
+    updateChannelVolume(channel, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const volume = state.volume * state.expression;
         const { gainLeft, gainRight } = this.panToGain(state.pan);
         channel.gainL.gain
             .cancelScheduledValues(now)
-            .setValueAtTime(volume * gainLeft, now);
+            .setValueAtTime(volume * gainLeft, scheduleTime);
         channel.gainR.gain
             .cancelScheduledValues(now)
-            .setValueAtTime(volume * gainRight, now);
+            .setValueAtTime(volume * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value) {
         this.channels[channelNumber].state.sustainPedal = value / 127;

package/script/midy-GM2.d.ts

@@ -2,9 +2,6 @@ export class MidyGM2 {
     static channelSettings: {
         currentBufferSource: null;
         detune: number;
-        scaleOctaveTuningTable: Int8Array<ArrayBuffer>;
-        channelPressureTable: Uint8Array<ArrayBuffer>;
-        keyBasedInstrumentControlTable: Int8Array<ArrayBuffer>;
         program: number;
         bank: number;
         bankMSB: number;
@@ -86,12 +83,12 @@ export class MidyGM2 {
     };
     controlChangeHandlers: {
         0: (channelNumber: any, msb: any) => void;
-        1: (channelNumber: any, modulation: any) => void;
+        1: (channelNumber: any, modulation: any, scheduleTime: 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;
+        7: (channelNumber: any, volume: any, scheduleTime: any) => void;
+        10: (channelNumber: any, pan: any, scheduleTime: any) => void;
+        11: (channelNumber: any, expression: any, scheduleTime: any) => void;
         32: (channelNumber: any, lsb: any) => void;
         38: (channelNumber: any, value: any) => void;
         64: (channelNumber: any, value: any) => void;
@@ -156,6 +153,7 @@ export class MidyGM2 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
+    processScheduledNotes(channel: any, scheduleTime: any, callback: any): void;
     getActiveNotes(channel: any, time: any): SparseMap;
     getActiveNote(noteList: any, time: any): any;
     createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
@@ -187,14 +185,14 @@ export class MidyGM2 {
     calcChannelDetune(channel: any): any;
     calcNoteDetune(channel: any, note: any): any;
     updateChannelDetune(channel: any): void;
-    updateDetune(channel: any, note: any, pressure: any): void;
+    updateDetune(channel: any, note: any): void;
     getPortamentoTime(channel: any): number;
     setPortamentoStartVolumeEnvelope(channel: any, note: any): void;
-    setVolumeEnvelope(note: any, pressure: any): void;
-    setPitchEnvelope(note: any): void;
+    setVolumeEnvelope(channel: any, note: any): void;
+    setPitchEnvelope(note: any, scheduleTime: any): void;
     clampCutoffFrequency(frequency: any): number;
     setPortamentoStartFilterEnvelope(channel: any, note: any): void;
-    setFilterEnvelope(channel: any, note: any, pressure: any): void;
+    setFilterEnvelope(channel: any, note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     startVibrato(channel: any, note: any, startTime: any): void;
     getAudioBuffer(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
@@ -209,13 +207,13 @@ export class MidyGM2 {
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
-    handleChannelPressure(channelNumber: any, value: any): void;
+    handleChannelPressure(channelNumber: any, value: any, startTime: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
-    setModLfoToPitch(channel: any, note: any, pressure: any): void;
+    setModLfoToPitch(channel: any, note: any): void;
     setVibLfoToPitch(channel: any, note: any): void;
-    setModLfoToFilterFc(note: any, pressure: any): void;
-    setModLfoToVolume(note: any, pressure: any): void;
+    setModLfoToFilterFc(channel: any, note: any): void;
+    setModLfoToVolume(channel: any, note: any): void;
     setReverbEffectsSend(channel: any, note: any, prevValue: any): void;
     setChorusEffectsSend(channel: any, note: any, prevValue: any): void;
     setDelayModLFO(note: any): void;
@@ -237,12 +235,12 @@ export class MidyGM2 {
     applyVoiceParams(channel: any, controllerType: any): void;
     createControlChangeHandlers(): {
         0: (channelNumber: any, msb: any) => void;
-        1: (channelNumber: any, modulation: any) => void;
+        1: (channelNumber: any, modulation: any, scheduleTime: 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;
+        7: (channelNumber: any, volume: any, scheduleTime: any) => void;
+        10: (channelNumber: any, pan: any, scheduleTime: any) => void;
+        11: (channelNumber: any, expression: any, scheduleTime: any) => void;
         32: (channelNumber: any, lsb: any) => void;
         38: (channelNumber: any, value: any) => void;
         64: (channelNumber: any, value: any) => void;
@@ -261,20 +259,20 @@ export class MidyGM2 {
         126: () => void;
         127: () => void;
     };
-    handleControlChange(channelNumber: any, controllerType: any, value: any): void;
+    handleControlChange(channelNumber: any, controllerType: any, value: any, startTime: any): void;
     setBankMSB(channelNumber: any, msb: any): void;
-    updateModulation(channel: any): void;
-    setModulationDepth(channelNumber: any, modulation: any): void;
+    updateModulation(channel: any, scheduleTime: any): void;
+    setModulationDepth(channelNumber: any, modulation: any, scheduleTime: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
-    setKeyBasedVolume(channel: any): void;
-    setVolume(channelNumber: any, volume: any): void;
+    setKeyBasedVolume(channel: any, scheduleTime: any): void;
+    setVolume(channelNumber: any, volume: any, scheduleTime: any): void;
     panToGain(pan: any): {
         gainLeft: number;
         gainRight: number;
     };
-    setKeyBasedPan(channel: any): void;
-    setPan(channelNumber: any, pan: any): void;
-    setExpression(channelNumber: any, expression: any): void;
+    setKeyBasedPan(channel: any, scheduleTime: any): void;
+    setPan(channelNumber: any, pan: any, scheduleTime: any): void;
+    setExpression(channelNumber: any, expression: any, scheduleTime: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
     dataEntryLSB(channelNumber: any, value: any): void;
     updateChannelVolume(channel: any): void;
@@ -335,7 +333,12 @@ export class MidyGM2 {
     getChorusSendToReverb(value: any): number;
     getChannelBitmap(data: any): any[];
     handleScaleOctaveTuning1ByteFormatSysEx(data: any, realtime: any): void;
-    applyDestinationSettings(channel: any, note: any, table: any): void;
+    getFilterCutoffControl(channel: any): number;
+    getAmplitudeControl(channel: any): number;
+    getLFOPitchDepth(channel: any): number;
+    getLFOFilterDepth(channel: any): number;
+    getLFOAmplitudeDepth(channel: any): number;
+    setControllerParameters(channel: any, note: any, table: any): void;
     handleChannelPressureSysEx(data: any, tableName: any): void;
     initControlTable(): Uint8Array<ArrayBuffer>;
     applyControlTable(channel: any, controllerType: any): void;
@@ -363,11 +366,12 @@ declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;
     filterNode: any;
+    filterDepth: any;
     volumeEnvelopeNode: any;
+    volumeDepth: any;
     volumeNode: any;
     gainL: any;
     gainR: any;
-    volumeDepth: any;
     modulationLFO: any;
     modulationDepth: any;
     vibratoLFO: 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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"}