@marmooo/midy 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "test": "node test_runner.js"
   },
   "dependencies": {
-    "@marmooo/soundfont-parser": "^0.1.2",
+    "@marmooo/soundfont-parser": "^0.1.3",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -30,25 +30,26 @@ export class MidyGM1 {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    playPromise: any;
     timeline: any[];
-    instruments: any[];
     notePromises: any[];
+    instruments: Set<any>;
     exclusiveClassNotes: any[];
     audioContext: any;
     masterVolume: any;
     scheduler: any;
     schedulerBuffer: any;
     voiceParamsHandlers: {
-        modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        modLfoToFilterFc: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        modLfoToVolume: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        delayModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        freqModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        delayVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        freqVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
+        modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, scheduleTime: any) => void;
+        modLfoToVolume: (channel: any, note: any, scheduleTime: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        delayModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        freqModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
     };
     controlChangeHandlers: any[];
     channels: any[];
@@ -58,7 +59,7 @@ export class MidyGM1 {
     loadSoundFont(input: any): Promise<void>;
     loadMIDI(input: any): Promise<void>;
     cacheVoiceIds(): void;
-    getVoiceId(channel: any, noteNumber: any, velocity: any): string | undefined;
+    getVoiceId(channel: any, noteNumber: any, velocity: any): any;
     createChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
@@ -69,7 +70,9 @@ export class MidyGM1 {
     createBufferSource(voiceParams: any, audioBuffer: any): any;
     scheduleTimelineEvents(t: any, resumeTime: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
-    playNotes(): Promise<any>;
+    resetAllStates(): void;
+    updateStates(queueIndex: any, nextQueueIndex: any): void;
+    playNotes(): Promise<void>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
     extractMidiData(midi: any): {
@@ -80,8 +83,8 @@ export class MidyGM1 {
     stopChannelNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopNotes(velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     start(): Promise<void>;
-    stop(): void;
-    pause(): void;
+    stop(): Promise<void>;
+    pause(): Promise<void>;
     resume(): Promise<void>;
     seekTo(second: any): void;
     calcTotalTime(): number;
@@ -122,16 +125,16 @@ export class MidyGM1 {
     setDelayModLFO(note: any, scheduleTime: any): void;
     setFreqModLFO(note: any, scheduleTime: any): void;
     createVoiceParamsHandlers(): {
-        modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        modLfoToFilterFc: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        modLfoToVolume: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        delayModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        freqModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        delayVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        freqVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
+        modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, scheduleTime: any) => void;
+        modLfoToVolume: (channel: any, note: any, scheduleTime: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        delayModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        freqModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
     };
     getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any, scheduleTime: any): void;
@@ -162,7 +165,7 @@ export class MidyGM1 {
     handleCoarseTuningRPN(channelNumber: any, scheduleTime: any): void;
     setCoarseTuning(channelNumber: any, value: any, scheduleTime: any): void;
     allSoundOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
-    resetAllStates(channelNumber: any): void;
+    resetChannelStates(channelNumber: any): void;
     resetAllControllers(channelNumber: any, _value: any, scheduleTime: any): void;
     allNotesOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
     handleUniversalNonRealTimeExclusiveMessage(data: any, scheduleTime: 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":"AA4FA;IAwBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAlDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,2BAAqC;IAgBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,6EAcC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,4DASC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAgEC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,kGAmCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAeC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;IAED,qCAeC;IAED,+FAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAKC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AA//CD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,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":"AA4FA;IAyBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAnDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAgBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAcC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,4DASC;IAED,+EAkDC;IAED,mCAOC;IAED,uBAQC;IAED,yDA2BC;IAED,2BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAKC;IAED,uBAQC;IAED,wBAKC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,kGAmCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAeC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAWC;IAED,wDASC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAhiDD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,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

@@ -247,13 +247,13 @@ class MidyGM1 {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "timeline", {
+        Object.defineProperty(this, "playPromise", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: void 0
         });
-        Object.defineProperty(this, "instruments", {
+        Object.defineProperty(this, "timeline", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -265,6 +265,12 @@ class MidyGM1 {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "instruments", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
         Object.defineProperty(this, "exclusiveClassNotes", {
             enumerable: true,
             configurable: true,
@@ -385,7 +391,7 @@ class MidyGM1 {
         const soundFont = this.soundFonts[soundFontIndex];
         const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
         const { instrument, sampleID } = voice.generators;
-        return `${soundFontIndex}:${instrument}:${sampleID}`;
+        return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
         const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
@@ -473,69 +479,80 @@ class MidyGM1 {
         }
         return 0;
     }
-    playNotes() {
-        return new Promise((resolve) => {
-            this.isPlaying = true;
-            this.isPaused = false;
-            this.startTime = this.audioContext.currentTime;
-            let queueIndex = this.getQueueIndex(this.resumeTime);
-            let resumeTime = this.resumeTime - this.startTime;
+    resetAllStates() {
+        this.exclusiveClassNotes.fill(undefined);
+        this.drumExclusiveClassNotes.fill(undefined);
+        this.voiceCache.clear();
+        for (let i = 0; i < this.channels.length; i++) {
+            this.channels[i].scheduledNotes = [];
+            this.resetChannelStates(i);
+        }
+    }
+    updateStates(queueIndex, nextQueueIndex) {
+        if (nextQueueIndex < queueIndex)
+            queueIndex = 0;
+        for (let i = queueIndex; i < nextQueueIndex; i++) {
+            const event = this.timeline[i];
+            switch (event.type) {
+                case "controller":
+                    this.setControlChange(event.channel, event.controllerType, event.value, 0);
+                    break;
+                case "programChange":
+                    this.setProgramChange(event.channel, event.programNumber, 0);
+                    break;
+                case "pitchBend":
+                    this.setPitchBend(event.channel, event.value + 8192, 0);
+                    break;
+                case "sysEx":
+                    this.handleSysEx(event.data, 0);
+            }
+        }
+    }
+    async playNotes() {
+        if (this.audioContext.state === "suspended") {
+            await this.audioContext.resume();
+        }
+        this.isPlaying = true;
+        this.isPaused = false;
+        this.startTime = this.audioContext.currentTime;
+        let queueIndex = this.getQueueIndex(this.resumeTime);
+        let resumeTime = this.resumeTime - this.startTime;
+        let finished = false;
+        this.notePromises = [];
+        while (queueIndex < this.timeline.length) {
+            const now = this.audioContext.currentTime;
+            const t = now + resumeTime;
+            queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
+            if (this.isPausing) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                this.notePromises = [];
+                break;
+            }
+            else if (this.isStopping) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                finished = true;
+                break;
+            }
+            else if (this.isSeeking) {
+                await this.stopNotes(0, true, now);
+                this.startTime = this.audioContext.currentTime;
+                const nextQueueIndex = this.getQueueIndex(this.resumeTime);
+                this.updateStates(queueIndex, nextQueueIndex);
+                queueIndex = nextQueueIndex;
+                resumeTime = this.resumeTime - this.startTime;
+                this.isSeeking = false;
+                continue;
+            }
+            const waitTime = now + this.noteCheckInterval;
+            await this.scheduleTask(() => { }, waitTime);
+        }
+        if (finished) {
             this.notePromises = [];
-            const schedulePlayback = async () => {
-                if (queueIndex >= this.timeline.length) {
-                    await Promise.all(this.notePromises);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.channels[i].scheduledNotes = [];
-                        this.resetAllStates(i);
-                    }
-                    resolve();
-                    return;
-                }
-                const now = this.audioContext.currentTime;
-                const t = now + resumeTime;
-                queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
-                if (this.isPausing) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.isPausing = false;
-                    this.isPaused = true;
-                    resolve();
-                    return;
-                }
-                else if (this.isStopping) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.channels[i].scheduledNotes = [];
-                        this.resetAllStates(i);
-                    }
-                    this.isStopping = false;
-                    this.isPaused = false;
-                    resolve();
-                    return;
-                }
-                else if (this.isSeeking) {
-                    this.stopNotes(0, true, now);
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.startTime = this.audioContext.currentTime;
-                    queueIndex = this.getQueueIndex(this.resumeTime);
-                    resumeTime = this.resumeTime - this.startTime;
-                    this.isSeeking = false;
-                    await schedulePlayback();
-                }
-                else {
-                    const waitTime = now + this.noteCheckInterval;
-                    await this.scheduleTask(() => { }, waitTime);
-                    await schedulePlayback();
-                }
-            };
-            schedulePlayback();
-        });
+            this.resetAllStates();
+        }
+        this.isPlaying = false;
     }
     ticksToSecond(ticks, secondsPerBeat) {
         return ticks * secondsPerBeat / this.ticksPerBeat;
@@ -636,26 +653,32 @@ class MidyGM1 {
         this.resumeTime = 0;
         if (this.voiceCounter.size === 0)
             this.cacheVoiceIds();
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
     }
-    stop() {
+    async stop() {
         if (!this.isPlaying)
             return;
         this.isStopping = true;
+        await this.playPromise;
+        this.isStopping = false;
     }
-    pause() {
+    async pause() {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
         this.resumeTime += now - this.startTime - this.startDelay;
         this.isPausing = true;
+        await this.playPromise;
+        this.isPausing = false;
+        this.isPaused = true;
     }
     async resume() {
         if (!this.isPaused)
             return;
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
+        this.isPaused = false;
     }
     seekTo(second) {
         this.resumeTime = second;
@@ -1018,13 +1041,17 @@ class MidyGM1 {
         this.applyVoiceParams(channel, 14, scheduleTime);
     }
     setModLfoToPitch(channel, note, scheduleTime) {
-        const modLfoToPitch = note.voiceParams.modLfoToPitch;
-        const baseDepth = Math.abs(modLfoToPitch) +
-            channel.state.modulationDepth;
-        const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
-        note.modulationDepth.gain
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(modulationDepth, scheduleTime);
+        if (note.modulationDepth) {
+            const modLfoToPitch = note.voiceParams.modLfoToPitch;
+            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
+            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            note.modulationDepth.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(modulationDepth, scheduleTime);
+        }
+        else {
+            this.startModulation(channel, note, scheduleTime);
+        }
     }
     setModLfoToFilterFc(note, scheduleTime) {
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
@@ -1056,28 +1083,36 @@ class MidyGM1 {
     }
     createVoiceParamsHandlers() {
         return {
-            modLfoToPitch: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToPitch: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
-            vibLfoToPitch: (_channel, _note, _prevValue, _scheduleTime) => { },
-            modLfoToFilterFc: (channel, note, _prevValue, scheduleTime) => {
+            vibLfoToPitch: (_channel, _note, _scheduleTime) => { },
+            modLfoToFilterFc: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToFilterFc(note, scheduleTime);
                 }
             },
-            modLfoToVolume: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToVolume: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToVolume(note, scheduleTime);
                 }
             },
-            chorusEffectsSend: (_channel, _note, _prevValue, _scheduleTime) => { },
-            reverbEffectsSend: (_channel, _note, _prevValue, _scheduleTime) => { },
-            delayModLFO: (_channel, note, _prevValue, scheduleTime) => this.setDelayModLFO(note, scheduleTime),
-            freqModLFO: (_channel, note, _prevValue, scheduleTime) => this.setFreqModLFO(note, scheduleTime),
-            delayVibLFO: (_channel, _note, _prevValue, _scheduleTime) => { },
-            freqVibLFO: (_channel, _note, _prevValue, _scheduleTime) => { },
+            chorusEffectsSend: (_channel, _note, _scheduleTime) => { },
+            reverbEffectsSend: (_channel, _note, _scheduleTime) => { },
+            delayModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setDelayModLFO(note, scheduleTime);
+                }
+            },
+            freqModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setFreqModLFO(note, scheduleTime);
+                }
+            },
+            delayVibLFO: (_channel, _note, _scheduleTime) => { },
+            freqVibLFO: (_channel, _note, _scheduleTime) => { },
         };
     }
     getControllerState(channel, noteNumber, velocity) {
@@ -1100,7 +1135,7 @@ class MidyGM1 {
                     continue;
                 note.voiceParams[key] = value;
                 if (key in this.voiceParamsHandlers) {
-                    this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
+                    this.voiceParamsHandlers[key](channel, note, scheduleTime);
                 }
                 else {
                     if (volumeEnvelopeKeySet.has(key))
@@ -1153,7 +1188,6 @@ class MidyGM1 {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
             }
             else {
-                this.setPitchEnvelope(note, scheduleTime);
                 this.startModulation(channel, note, scheduleTime);
             }
         });
@@ -1272,8 +1306,8 @@ class MidyGM1 {
     }
     handlePitchBendRangeRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
-        this.limitData(channel, 0, 127, 0, 99);
-        const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
+        this.limitData(channel, 0, 127, 0, 127);
+        const pitchBendRange = (channel.dataMSB + channel.dataLSB / 128) * 100;
         this.setPitchBendRange(channelNumber, pitchBendRange, scheduleTime);
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
@@ -1281,7 +1315,7 @@ class MidyGM1 {
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
-        const next = value / 128;
+        const next = value / 12800;
         state.pitchWheelSensitivity = next;
         channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1290,14 +1324,15 @@ class MidyGM1 {
     handleFineTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
-        const fineTuning = channel.dataMSB * 128 + channel.dataLSB;
+        const value = channel.dataMSB * 128 + channel.dataLSB;
+        const fineTuning = (value - 8192) / 8192 * 100;
         this.setFineTuning(channelNumber, fineTuning, scheduleTime);
     }
     setFineTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.fineTuning;
-        const next = (value - 8192) / 8.192; // cent
+        const next = value;
         channel.fineTuning = next;
         channel.detune += next - prev;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1305,14 +1340,14 @@ class MidyGM1 {
     handleCoarseTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
-        const coarseTuning = channel.dataMSB;
+        const coarseTuning = (channel.dataMSB - 64) * 100;
         this.setCoarseTuning(channelNumber, coarseTuning, scheduleTime);
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.coarseTuning;
-        const next = (value - 64) * 100; // cent
+        const next = value;
         channel.coarseTuning = next;
         channel.detune += next - prev;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1321,7 +1356,7 @@ class MidyGM1 {
         scheduleTime ??= this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
-    resetAllStates(channelNumber) {
+    resetChannelStates(channelNumber) {
         const scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
@@ -1475,7 +1510,7 @@ Object.defineProperty(MidyGM1, "channelSettings", {
         rpnMSB: 127,
         rpnLSB: 127,
         modulationDepthRange: 50, // cent
-        fineTuning: 0, // cb
-        coarseTuning: 0, // cb
+        fineTuning: 0, // cent
+        coarseTuning: 0, // cent
     }
 });