@marmooo/midy 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",

package/script/midy-GM1.d.ts

@@ -1,6 +1,7 @@
 export class MidyGM1 {
     static channelSettings: {
         currentBufferSource: null;
+        detune: number;
         program: number;
         bank: number;
         dataMSB: number;
@@ -92,11 +93,13 @@ export class MidyGM1 {
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
     cbToRatio(cb: any): number;
+    rateToCent(rate: any): number;
+    centToRate(cent: any): number;
     centToHz(cent: any): number;
-    calcSemitoneOffset(channel: any): any;
+    calcChannelDetune(channel: any): any;
+    updateDetune(channel: any): void;
     setVolumeEnvelope(note: any): void;
-    setPlaybackRate(note: any): void;
-    setPitch(channel: any, note: any): void;
+    setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
@@ -112,9 +115,9 @@ export class MidyGM1 {
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
     setModLfoToPitch(channel: any, note: any): void;
-    setModLfoToVolume(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(): {
@@ -129,7 +132,7 @@ export class MidyGM1 {
         delayVibLFO: (channel: any, note: any, prevValue: any) => void;
         freqVibLFO: (channel: any, note: any, _prevValue: any) => void;
     };
-    getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array;
+    getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any): void;
     createControlChangeHandlers(): {
         1: (channelNumber: any, modulation: any) => void;
@@ -164,13 +167,12 @@ export class MidyGM1 {
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
     dataEntryMSB(channelNumber: any, value: any): void;
-    updateDetune(channel: any, detune: any): void;
     handlePitchBendRangeRPN(channelNumber: any): void;
-    setPitchBendRange(channelNumber: any, pitchWheelSensitivity: any): void;
+    setPitchBendRange(channelNumber: any, value: any): void;
     handleFineTuningRPN(channelNumber: any): void;
-    setFineTuning(channelNumber: any, fineTuning: any): void;
+    setFineTuning(channelNumber: any, value: any): void;
     handleCoarseTuningRPN(channelNumber: any): void;
-    setCoarseTuning(channelNumber: any, coarseTuning: any): void;
+    setCoarseTuning(channelNumber: any, value: any): void;
     allSoundOff(channelNumber: any): Promise<void>;
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): Promise<void>;
@@ -187,7 +189,7 @@ declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;
     filterNode: any;
-    volumeNode: any;
+    volumeEnvelopeNode: any;
     volumeDepth: any;
     modulationLFO: any;
     modulationDepth: 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":"AAqFA;IAoBE;;;;;;;;;;;MAWE;IAEF,+BAQC;IAxCD,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;IAClB,iCAA8B;IAgB5B,kBAAgC;IAChC,gBAA4C;IAC5C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,4BAEC;IAED,sCAMC;IAED,mCAgBC;IAED,iCAKC;IAED,wCAmBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA4BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDAOC;IAED,gDASC;IAED,mCAQC;IAED,gDASC;IAED,qCAMC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA2CC;IAED,+EAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EASC;IAED,qCAiBC;IAED,8DAKC;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,8CAYC;IAED,kDAKC;IAED,wEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAzyCD;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,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":"AAqFA;IAoBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IAzCD,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;IAClB,iCAA8B;IAiB5B,kBAAgC;IAChC,gBAA4C;IAC5C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,iCAWC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;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;;;;;;;;;;;MA2CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EASC;IAED,qCAiBC;IAED,8DAKC;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;AAjzCD;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"}

package/script/midy-GM1.js

@@ -17,7 +17,7 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "volumeNode", {
+        Object.defineProperty(this, "volumeEnvelopeNode", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -596,16 +596,35 @@ class MidyGM1 {
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
     }
+    rateToCent(rate) {
+        return 1200 * Math.log2(rate);
+    }
+    centToRate(cent) {
+        return Math.pow(2, cent / 1200);
+    }
     centToHz(cent) {
-        return 8.176 * Math.pow(2, cent / 1200);
+        return 8.176 * this.centToRate(cent);
     }
-    calcSemitoneOffset(channel) {
+    calcChannelDetune(channel) {
         const tuning = channel.coarseTuning + channel.fineTuning;
         const pitchWheel = channel.state.pitchWheel * 2 - 1;
-        const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 128;
+        const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 12800;
         const pitch = pitchWheel * pitchWheelSensitivity;
         return tuning + pitch;
     }
+    updateDetune(channel) {
+        const now = this.audioContext.currentTime;
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                note.bufferSource.detune
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(channel.detune, now);
+            }
+        });
+    }
     setVolumeEnvelope(note) {
         const now = this.audioContext.currentTime;
         const { voiceParams, startTime } = note;
@@ -615,7 +634,7 @@ class MidyGM1 {
         const volAttack = volDelay + voiceParams.volAttack;
         const volHold = volAttack + voiceParams.volHold;
         const volDecay = volHold + voiceParams.volDecay;
-        note.volumeNode.gain
+        note.volumeEnvelopeNode.gain
             .cancelScheduledValues(now)
             .setValueAtTime(0, startTime)
             .setValueAtTime(1e-6, volDelay) // exponentialRampToValueAtTime() requires a non-zero value
@@ -623,32 +642,28 @@ class MidyGM1 {
             .setValueAtTime(attackVolume, volHold)
             .linearRampToValueAtTime(sustainVolume, volDecay);
     }
-    setPlaybackRate(note) {
+    setPitchEnvelope(note) {
         const now = this.audioContext.currentTime;
+        const { voiceParams } = note;
+        const baseRate = voiceParams.playbackRate;
         note.bufferSource.playbackRate
             .cancelScheduledValues(now)
-            .setValueAtTime(note.voiceParams.playbackRate, now);
-    }
-    setPitch(channel, note) {
-        const now = this.audioContext.currentTime;
-        const { startTime } = note;
-        const basePitch = this.calcSemitoneOffset(channel) * 100;
-        note.bufferSource.detune
-            .cancelScheduledValues(now)
-            .setValueAtTime(basePitch, startTime);
-        const modEnvToPitch = note.voiceParams.modEnvToPitch;
+            .setValueAtTime(baseRate, now);
+        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 modAttack = modDelay + voiceParams.modAttack;
         const modHold = modAttack + voiceParams.modHold;
         const modDecay = modHold + voiceParams.modDecay;
-        note.bufferSource.detune
-            .setValueAtTime(basePitch, modDelay)
-            .exponentialRampToValueAtTime(peekPitch, modAttack)
-            .setValueAtTime(peekPitch, modHold)
-            .linearRampToValueAtTime(basePitch, modDecay);
+        note.bufferSource.playbackRate
+            .setValueAtTime(baseRate, modDelay)
+            .exponentialRampToValueAtTime(peekRate, modAttack)
+            .setValueAtTime(peekRate, modHold)
+            .linearRampToValueAtTime(baseRate, modDecay);
     }
     clampCutoffFrequency(frequency) {
         const minFrequency = 20; // min Hz of initialFilterFc
@@ -695,27 +710,26 @@ class MidyGM1 {
         note.modulationLFO.connect(note.modulationDepth);
         note.modulationDepth.connect(note.bufferSource.detune);
         note.modulationLFO.connect(note.volumeDepth);
-        note.volumeDepth.connect(note.volumeNode.gain);
+        note.volumeDepth.connect(note.volumeEnvelopeNode.gain);
     }
     async createNote(channel, voice, noteNumber, velocity, startTime, isSF3) {
         const state = channel.state;
         const voiceParams = voice.getAllParams(state.array);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
         note.bufferSource = await this.createNoteBufferNode(voiceParams, isSF3);
-        note.volumeNode = new GainNode(this.audioContext);
+        note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
             Q: voiceParams.initialFilterQ / 10, // dB
         });
         this.setVolumeEnvelope(note);
         this.setFilterEnvelope(note);
-        this.setPlaybackRate(note);
+        this.setPitchEnvelope(note);
         if (0 < state.modulationDepth) {
-            this.setPitch(channel, note);
             this.startModulation(channel, note, startTime);
         }
         note.bufferSource.connect(note.filterNode);
-        note.filterNode.connect(note.volumeNode);
+        note.filterNode.connect(note.volumeEnvelopeNode);
         note.bufferSource.start(startTime);
         return note;
     }
@@ -731,8 +745,8 @@ class MidyGM1 {
         if (!voice)
             return;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, isSF3);
-        note.volumeNode.connect(channel.gainL);
-        note.volumeNode.connect(channel.gainR);
+        note.volumeEnvelopeNode.connect(channel.gainL);
+        note.volumeEnvelopeNode.connect(channel.gainR);
         const exclusiveClass = note.voiceParams.exclusiveClass;
         if (exclusiveClass !== 0) {
             if (this.exclusiveClassMap.has(exclusiveClass)) {
@@ -760,7 +774,7 @@ class MidyGM1 {
     }
     stopNote(endTime, stopTime, scheduledNotes, index) {
         const note = scheduledNotes[index];
-        note.volumeNode.gain
+        note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
             .linearRampToValueAtTime(0, stopTime);
         note.ending = true;
@@ -771,8 +785,8 @@ class MidyGM1 {
             note.bufferSource.onended = () => {
                 scheduledNotes[index] = null;
                 note.bufferSource.disconnect();
-                note.volumeNode.disconnect();
                 note.filterNode.disconnect();
+                note.volumeEnvelopeNode.disconnect();
                 if (note.modulationDepth) {
                     note.volumeDepth.disconnect();
                     note.modulationDepth.disconnect();
@@ -859,29 +873,22 @@ class MidyGM1 {
     setPitchBend(channelNumber, value) {
         const channel = this.channels[channelNumber];
         const state = channel.state;
+        const prev = state.pitchWheel * 2 - 1;
+        const next = (value - 8192) / 8192;
         state.pitchWheel = value / 16383;
-        const pitchWheel = (value - 8192) / 8192;
-        const detuneChange = pitchWheel * state.pitchWheelSensitivity * 12800;
-        this.updateDetune(channel, detuneChange);
+        channel.detune += (next - prev) * state.pitchWheelSensitivity * 12800;
+        this.updateDetune(channel);
+        this.applyVoiceParams(channel, 14);
     }
     setModLfoToPitch(channel, note) {
         const now = this.audioContext.currentTime;
         const modLfoToPitch = note.voiceParams.modLfoToPitch;
-        const modulationDepth = Math.abs(modLfoToPitch) +
+        const baseDepth = Math.abs(modLfoToPitch) +
             channel.state.modulationDepth;
-        const modulationDepthSign = (0 < modLfoToPitch) ? 1 : -1;
+        const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
         note.modulationDepth.gain
             .cancelScheduledValues(now)
-            .setValueAtTime(modulationDepth * modulationDepthSign, now);
-    }
-    setModLfoToVolume(note) {
-        const now = this.audioContext.currentTime;
-        const modLfoToVolume = note.voiceParams.modLfoToVolume;
-        const volumeDepth = this.cbToRatio(Math.abs(modLfoToVolume)) - 1;
-        const volumeDepthSign = (0 < modLfoToVolume) ? 1 : -1;
-        note.volumeDepth.gain
-            .cancelScheduledValues(now)
-            .setValueAtTime(volumeDepth * volumeDepthSign, now);
+            .setValueAtTime(modulationDepth, now);
     }
     setVibLfoToPitch(channel, note) {
         const now = this.audioContext.currentTime;
@@ -900,6 +907,15 @@ class MidyGM1 {
             .cancelScheduledValues(now)
             .setValueAtTime(modLfoToFilterFc, now);
     }
+    setModLfoToVolume(note) {
+        const now = this.audioContext.currentTime;
+        const modLfoToVolume = note.voiceParams.modLfoToVolume;
+        const baseDepth = this.cbToRatio(Math.abs(modLfoToVolume)) - 1;
+        const volumeDepth = baseDepth * Math.sign(modLfoToVolume);
+        note.volumeDepth.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(volumeDepth, now);
+    }
     setDelayModLFO(note) {
         const now = this.audioContext.currentTime;
         const startTime = note.startTime;
@@ -999,7 +1015,7 @@ class MidyGM1 {
                                 noteVoiceParams[key] = voiceParams[key];
                         }
                         this.setFilterEnvelope(channel, note);
-                        this.setPitch(channel, note);
+                        this.setPitchEnvelope(note);
                     }
                     else if (volumeEnvelopeKeySet.has(key)) {
                         if (appliedVolumeEnvelope)
@@ -1053,7 +1069,7 @@ class MidyGM1 {
                     note.modulationDepth.gain.setValueAtTime(channel.state.modulationDepth, now);
                 }
                 else {
-                    this.setPitch(channel, note);
+                    this.setPitchEnvelope(note);
                     this.startModulation(channel, note, now);
                 }
             }
@@ -1162,59 +1178,49 @@ class MidyGM1 {
         this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber);
     }
-    updateDetune(channel, detune) {
-        const now = this.audioContext.currentTime;
-        channel.scheduledNotes.forEach((noteList) => {
-            for (let i = 0; i < noteList.length; i++) {
-                const note = noteList[i];
-                if (!note)
-                    continue;
-                const { bufferSource } = note;
-                bufferSource.detune
-                    .cancelScheduledValues(now)
-                    .setValueAtTime(detune, now);
-            }
-        });
-    }
     handlePitchBendRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 99);
         const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
         this.setPitchBendRange(channelNumber, pitchBendRange);
     }
-    setPitchBendRange(channelNumber, pitchWheelSensitivity) {
+    setPitchBendRange(channelNumber, value) {
         const channel = this.channels[channelNumber];
         const state = channel.state;
-        state.pitchWheelSensitivity = pitchWheelSensitivity / 128;
-        const detune = (state.pitchWheel * 2 - 1) * pitchWheelSensitivity * 100;
-        this.updateDetune(channel, detune);
+        const prev = state.pitchWheelSensitivity;
+        const next = value / 128;
+        state.pitchWheelSensitivity = next;
+        channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
+        this.updateDetune(channel);
         this.applyVoiceParams(channel, 16);
     }
     handleFineTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
-        const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
+        const fineTuning = channel.dataMSB * 128 + channel.dataLSB;
         this.setFineTuning(channelNumber, fineTuning);
     }
-    setFineTuning(channelNumber, fineTuning) {
+    setFineTuning(channelNumber, value) {
         const channel = this.channels[channelNumber];
-        const prevFineTuning = channel.fineTuning;
-        channel.fineTuning = fineTuning;
-        const detuneChange = channel.fineTuning - prevFineTuning;
-        this.updateDetune(channel, detuneChange);
+        const prev = channel.fineTuning;
+        const next = (value - 8192) / 8.192; // cent
+        channel.fineTuning = next;
+        channel.detune += next - prev;
+        this.updateDetune(channel);
     }
     handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
-        const coarseTuning = channel.dataMSB - 64;
-        this.setFineTuning(channelNumber, coarseTuning);
+        const coarseTuning = channel.dataMSB;
+        this.setCoarseTuning(channelNumber, coarseTuning);
     }
-    setCoarseTuning(channelNumber, coarseTuning) {
+    setCoarseTuning(channelNumber, value) {
         const channel = this.channels[channelNumber];
-        const prevCoarseTuning = channel.coarseTuning;
-        channel.coarseTuning = coarseTuning;
-        const detuneChange = channel.coarseTuning - prevCoarseTuning;
-        this.updateDetune(channel, detuneChange);
+        const prev = channel.coarseTuning;
+        const next = (value - 64) * 100; // cent
+        channel.coarseTuning = next;
+        channel.detune += next - prev;
+        this.updateDetune(channel);
     }
     allSoundOff(channelNumber) {
         return this.stopChannelNotes(channelNumber, 0, true);
@@ -1328,6 +1334,7 @@ Object.defineProperty(MidyGM1, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        detune: 0,
         program: 0,
         bank: 0,
         dataMSB: 0,

package/script/midy-GM2.d.ts

@@ -1,6 +1,10 @@
 export class MidyGM2 {
     static channelSettings: {
         currentBufferSource: null;
+        detune: number;
+        scaleOctaveTuningTable: any[];
+        pressureTable: Uint8Array<ArrayBuffer>;
+        keyBasedInstrumentControlTable: Int8Array<ArrayBuffer>;
         program: number;
         bank: number;
         bankMSB: number;
@@ -79,8 +83,8 @@ export class MidyGM2 {
         vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
         modLfoToFilterFc: (channel: any, note: any, _prevValue: any) => void;
         modLfoToVolume: (channel: any, note: any) => void;
-        chorusEffectsSend: (_channel: any, note: any, prevValue: any) => void;
-        reverbEffectsSend: (_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;
@@ -182,12 +186,16 @@ export class MidyGM2 {
         feedbackGains: any[];
     };
     cbToRatio(cb: any): number;
+    rateToCent(rate: any): number;
+    centToRate(cent: any): number;
     centToHz(cent: any): number;
-    calcSemitoneOffset(channel: any): any;
+    calcChannelDetune(channel: any): any;
+    calcNoteDetune(channel: any, note: any): any;
+    updateDetune(channel: any): void;
+    getPortamentoTime(channel: any): number;
     setPortamentoStartVolumeEnvelope(channel: any, note: any): void;
-    setVolumeEnvelope(note: any): void;
-    setPlaybackRate(note: any): void;
-    setPitch(channel: any, note: any): void;
+    setVolumeEnvelope(channel: any, note: any): void;
+    setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;
     setPortamentoStartFilterEnvelope(channel: any, note: any): void;
     setFilterEnvelope(channel: any, note: any): void;
@@ -204,15 +212,16 @@ 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, pressure: any): void;
+    handleChannelPressure(channelNumber: any, value: any): void;
+    setChannelPressure(channel: any, note: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
     setModLfoToPitch(channel: any, note: any): void;
-    setModLfoToVolume(note: any): void;
-    setChorusEffectsSend(note: any, prevValue: any): void;
-    setReverbEffectsSend(note: any, prevValue: any): void;
     setVibLfoToPitch(channel: any, note: any): void;
-    setModLfoToFilterFc(note: 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;
     setFreqModLFO(note: any): void;
     createVoiceParamsHandlers(): {
@@ -220,14 +229,14 @@ export class MidyGM2 {
         vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
         modLfoToFilterFc: (channel: any, note: any, _prevValue: any) => void;
         modLfoToVolume: (channel: any, note: any) => void;
-        chorusEffectsSend: (_channel: any, note: any, prevValue: any) => void;
-        reverbEffectsSend: (_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;
     };
-    getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array;
+    getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any): void;
     createControlChangeHandlers(): {
         0: (channelNumber: any, msb: any) => void;
@@ -260,11 +269,13 @@ export class MidyGM2 {
     updateModulation(channel: any): void;
     setModulationDepth(channelNumber: any, modulation: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
+    setKeyBasedVolume(channel: any): void;
     setVolume(channelNumber: any, volume: 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;
     setBankLSB(channelNumber: any, lsb: any): void;
@@ -272,23 +283,22 @@ export class MidyGM2 {
     updateChannelVolume(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     setPortamento(channelNumber: any, value: any): void;
-    setReverbSendLevel(channelNumber: any, reverbSendLevel: any): void;
-    setChorusSendLevel(channelNumber: any, chorusSendLevel: any): void;
     setSostenutoPedal(channelNumber: any, value: any): void;
     setSoftPedal(channelNumber: any, softPedal: any): void;
+    setReverbSendLevel(channelNumber: any, reverbSendLevel: any): void;
+    setChorusSendLevel(channelNumber: any, chorusSendLevel: any): void;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
     limitDataMSB(channel: any, minMSB: any, maxMSB: any): void;
     handleRPN(channelNumber: any): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
     dataEntryMSB(channelNumber: any, value: any): void;
-    updateDetune(channel: any, detune: any): void;
     handlePitchBendRangeRPN(channelNumber: any): void;
-    setPitchBendRange(channelNumber: any, pitchWheelSensitivity: any): void;
+    setPitchBendRange(channelNumber: any, value: any): void;
     handleFineTuningRPN(channelNumber: any): void;
-    setFineTuning(channelNumber: any, fineTuning: any): void;
+    setFineTuning(channelNumber: any, value: any): void;
     handleCoarseTuningRPN(channelNumber: any): void;
-    setCoarseTuning(channelNumber: any, coarseTuning: any): void;
+    setCoarseTuning(channelNumber: any, value: any): void;
     handleModulationDepthRangeRPN(channelNumber: any): void;
     setModulationDepthRange(channelNumber: any, modulationDepthRange: any): void;
     allSoundOff(channelNumber: any): Promise<void>;
@@ -305,9 +315,9 @@ export class MidyGM2 {
     handleMasterVolumeSysEx(data: any): void;
     setMasterVolume(volume: any): void;
     handleMasterFineTuningSysEx(data: any): void;
-    setMasterFineTuning(fineTuning: any): void;
+    setMasterFineTuning(value: any): void;
     handleMasterCoarseTuningSysEx(data: any): void;
-    setMasterCoarseTuning(coarseTuning: any): void;
+    setMasterCoarseTuning(value: any): void;
     handleGlobalParameterControlSysEx(data: any): void;
     handleReverbParameterSysEx(data: any): void;
     setReverbType(type: any): void;
@@ -326,6 +336,11 @@ export class MidyGM2 {
     getChorusFeedback(value: any): number;
     setChorusSendToReverb(value: any): void;
     getChorusSendToReverb(value: any): number;
+    getChannelBitmap(data: any): any[];
+    handleScaleOctaveTuning1ByteFormatSysEx(data: any): void;
+    handleChannelPressureSysEx(data: any): void;
+    getKeyBasedInstrumentControlValue(channel: any, keyNumber: any, controllerType: any): number;
+    handleKeyBasedInstrumentControlSysEx(data: any): void;
     handleExclusiveMessage(data: any): void;
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;
@@ -334,7 +349,10 @@ declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;
     filterNode: any;
+    volumeEnvelopeNode: any;
     volumeNode: any;
+    gainL: any;
+    gainR: any;
     volumeDepth: any;
     modulationLFO: any;
     modulationDepth: 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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"}