@marmooo/midy 0.2.0 → 0.2.1

package/script/midy-GM2.js

@@ -901,16 +901,42 @@ class MidyGM2 {
     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) {
+    calcDetune(channel, note) {
         const masterTuning = this.masterCoarseTuning + this.masterFineTuning;
         const channelTuning = channel.coarseTuning + channel.fineTuning;
+        const scaleOctaveTuning = channel.scaleOctaveTuningTable[note.noteNumber % 12];
+        const tuning = masterTuning + channelTuning + scaleOctaveTuning;
         const pitchWheel = channel.state.pitchWheel * 2 - 1;
-        const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 128;
+        const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 12800;
         const pitch = pitchWheel * pitchWheelSensitivity;
-        return masterTuning + channelTuning + pitch;
+        return tuning + pitch;
+    }
+    calcNoteDetune(channel, note) {
+        return channel.scaleOctaveTuningTable[note.noteNumber % 12];
+    }
+    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;
+                const noteDetune = this.calcNoteDetune(channel, note);
+                const detune = channel.detune + noteDetune;
+                note.bufferSource.detune
+                    .cancelScheduledValues(now)
+                    .setValueAtTime(detune, now);
+            }
+        });
     }
     setPortamentoStartVolumeEnvelope(channel, note) {
         const now = this.audioContext.currentTime;
@@ -941,32 +967,28 @@ class MidyGM2 {
             .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
@@ -1077,9 +1099,8 @@ class MidyGM2 {
         if (0 < state.vibratoDepth) {
             this.startVibrato(channel, note, startTime);
         }
-        this.setPlaybackRate(note);
+        this.setPitchEnvelope(note);
         if (0 < state.modulationDepth) {
-            this.setPitch(channel, note);
             this.startModulation(channel, note, startTime);
         }
         if (this.mono && channel.currentBufferSource) {
@@ -1212,11 +1233,12 @@ class MidyGM2 {
             }
             else {
                 const portamentoTime = endTime + state.portamentoTime;
-                const detuneChange = (portamentoNoteNumber - noteNumber) * 100;
-                const detune = note.bufferSource.detune.value + detuneChange;
-                note.bufferSource.detune
+                const deltaNote = portamentoNoteNumber - noteNumber;
+                const baseRate = note.voiceParams.playbackRate;
+                const targetRate = baseRate * Math.pow(2, deltaNote / 12);
+                note.bufferSource.playbackRate
                     .cancelScheduledValues(endTime)
-                    .linearRampToValueAtTime(detune, portamentoTime);
+                    .linearRampToValueAtTime(targetRate, portamentoTime);
                 return this.stopNote(endTime, portamentoTime, scheduledNotes, i);
             }
         }
@@ -1303,10 +1325,11 @@ class MidyGM2 {
     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) {
@@ -1319,6 +1342,23 @@ class MidyGM2 {
             .cancelScheduledValues(now)
             .setValueAtTime(modulationDepth * modulationDepthSign, 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;
+        note.filterDepth.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(modLfoToFilterFc, now);
+    }
     setModLfoToVolume(note) {
         const now = this.audioContext.currentTime;
         const modLfoToVolume = note.voiceParams.modLfoToVolume;
@@ -1378,23 +1418,6 @@ class MidyGM2 {
             }
         }
     }
-    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;
-        note.filterDepth.gain
-            .cancelScheduledValues(now)
-            .setValueAtTime(modLfoToFilterFc, now);
-    }
     setDelayModLFO(note) {
         const now = this.audioContext.currentTime;
         const startTime = note.startTime;
@@ -1503,7 +1526,7 @@ class MidyGM2 {
                         else {
                             this.setFilterEnvelope(channel, note);
                         }
-                        this.setPitch(channel, note);
+                        this.setPitchEnvelope(note);
                     }
                     else if (volumeEnvelopeKeySet.has(key)) {
                         if (appliedVolumeEnvelope)
@@ -1575,7 +1598,7 @@ class MidyGM2 {
                     note.modulationDepth.gain.setValueAtTime(channel.state.modulationDepth, now);
                 }
                 else {
-                    this.setPitch(channel, note);
+                    this.setPitchEnvelope(note);
                     this.startModulation(channel, note, now);
                 }
             }
@@ -1796,59 +1819,49 @@ class MidyGM2 {
         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);
     }
     handleModulationDepthRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
@@ -1908,6 +1921,15 @@ class MidyGM2 {
     }
     handleUniversalNonRealTimeExclusiveMessage(data) {
         switch (data[2]) {
+            case 8:
+                switch (data[3]) {
+                    case 8:
+                        // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca21.pdf
+                        return this.handleScaleOctaveTuning1ByteFormat(data);
+                    default:
+                        console.warn(`Unsupported Exclusive Message: ${data}`);
+                }
+                break;
             case 9:
                 switch (data[3]) {
                     case 1:
@@ -1962,15 +1984,6 @@ class MidyGM2 {
                         console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
                 break;
-            case 8:
-                switch (data[3]) {
-                    // case 8:
-                    //   // TODO
-                    //   return this.handleScaleOctaveTuning1ByteFormat();
-                    default:
-                        console.warn(`Unsupported Exclusive Message: ${data}`);
-                }
-                break;
             case 9:
                 switch (data[3]) {
                     // case 1:
@@ -2011,27 +2024,59 @@ class MidyGM2 {
         }
     }
     handleMasterFineTuningSysEx(data) {
-        const fineTuning = (data[5] * 128 + data[4] - 8192) / 8192;
+        const fineTuning = data[5] * 128 + data[4];
         this.setMasterFineTuning(fineTuning);
     }
-    setMasterFineTuning(fineTuning) {
-        if (fineTuning < -1 && 1 < fineTuning) {
-            console.error("Master Fine Tuning value is out of range");
-        }
-        else {
-            this.masterFineTuning = fineTuning;
-        }
+    setMasterFineTuning(value) {
+        const prev = this.masterFineTuning;
+        const next = (value - 8192) / 8.192; // cent
+        this.masterFineTuning = next;
+        channel.detune += next - prev;
+        this.updateDetune(channel);
     }
     handleMasterCoarseTuningSysEx(data) {
         const coarseTuning = data[4];
         this.setMasterCoarseTuning(coarseTuning);
     }
-    setMasterCoarseTuning(coarseTuning) {
-        if (coarseTuning < 0 && 127 < coarseTuning) {
-            console.error("Master Coarse Tuning value is out of range");
+    setMasterCoarseTuning(value) {
+        const prev = this.masterCoarseTuning;
+        const next = (value - 64) * 100; // cent
+        this.masterCoarseTuning = next;
+        channel.detune += next - prev;
+        this.updateDetune(channel);
+    }
+    getChannelBitmap(data) {
+        const bitmap = new Array(16).fill(false);
+        const ff = data[4] & 0b11;
+        const gg = data[5] & 0x7F;
+        const hh = data[6] & 0x7F;
+        for (let bit = 0; bit < 7; bit++) {
+            if (hh & (1 << bit))
+                bitmap[bit] = true;
+        }
+        for (let bit = 0; bit < 7; bit++) {
+            if (gg & (1 << bit))
+                bitmap[bit + 7] = true;
+        }
+        for (let bit = 0; bit < 2; bit++) {
+            if (ff & (1 << bit))
+                bitmap[bit + 14] = true;
+        }
+        return bitmap;
+    }
+    handleScaleOctaveTuning1ByteFormat(data) {
+        if (data.length < 18) {
+            console.error("Data length is too short");
+            return;
         }
-        else {
-            this.masterCoarseTuning = coarseTuning - 64;
+        const channelBitmap = this.getChannelBitmap(data);
+        for (let i = 0; i < channelBitmap.length; i++) {
+            if (!channelBitmap[i])
+                continue;
+            for (let j = 0; j < 12; j++) {
+                const value = data[j + 7] - 64; // cent
+                this.channels[i].scaleOctaveTuningTable[j] = value;
+            }
         }
     }
     handleGlobalParameterControlSysEx(data) {
@@ -2252,6 +2297,8 @@ Object.defineProperty(MidyGM2, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        detune: 0,
+        scaleOctaveTuningTable: new Array(12).fill(0), // cent
         program: 0,
         bank: 121 * 128,
         bankMSB: 121,

package/script/midy-GMLite.d.ts

@@ -1,6 +1,7 @@
 export class MidyGMLite {
     static channelSettings: {
         currentBufferSource: null;
+        detune: number;
         program: number;
         bank: number;
         dataMSB: number;
@@ -89,11 +90,13 @@ export class MidyGMLite {
     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): number;
+    calcChannelDetune(channel: any): number;
+    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;
@@ -109,8 +112,8 @@ export class MidyGMLite {
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
     setModLfoToPitch(channel: any, note: any): void;
-    setModLfoToVolume(note: any): void;
     setModLfoToFilterFc(note: any): void;
+    setModLfoToVolume(note: any): void;
     setDelayModLFO(note: any): void;
     setFreqModLFO(note: any): void;
     createVoiceParamsHandlers(): {
@@ -159,7 +162,6 @@ export class MidyGMLite {
     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;
     allSoundOff(channelNumber: any): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAmFA;IAoBE;;;;;;;;MAQE;IAEF,+BAQC;IArCD,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;IAa5B,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,yCAIC;IAED,mCAgBC;IAED,iCAKC;IAED,wCAmBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA4BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFAwBC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDAOC;IAED,gDASC;IAED,mCAQC;IAED,qCAMC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MAqBC;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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,8CAYC;IAED,kDAKC;IAED,wEAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAjtCD;IAQE,0FAMC;IAbD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}
+{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAmFA;IAoBE;;;;;;;;;MASE;IAEF,+BAQC;IAtCD,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;IAc5B,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,wCAIC;IAED,iCAWC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;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,+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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wEAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AArtCD;IAQE,0FAMC;IAbD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GMLite.js

@@ -584,14 +584,33 @@ class MidyGMLite {
     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 pitchWheel = channel.state.pitchWheel * 2 - 1;
-        const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 128;
+        const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 12800;
         return pitchWheel * pitchWheelSensitivity;
     }
+    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;
@@ -609,32 +628,28 @@ class MidyGMLite {
             .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,9 +710,8 @@ class MidyGMLite {
         });
         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);
@@ -841,10 +855,12 @@ class MidyGMLite {
     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;
@@ -856,6 +872,13 @@ class MidyGMLite {
             .cancelScheduledValues(now)
             .setValueAtTime(modulationDepth * modulationDepthSign, now);
     }
+    setModLfoToFilterFc(note) {
+        const now = this.audioContext.currentTime;
+        const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
+        note.filterDepth.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(modLfoToFilterFc, now);
+    }
     setModLfoToVolume(note) {
         const now = this.audioContext.currentTime;
         const modLfoToVolume = note.voiceParams.modLfoToVolume;
@@ -865,13 +888,6 @@ class MidyGMLite {
             .cancelScheduledValues(now)
             .setValueAtTime(volumeDepth * volumeDepthSign, now);
     }
-    setModLfoToFilterFc(note) {
-        const now = this.audioContext.currentTime;
-        const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
-        note.filterDepth.gain
-            .cancelScheduledValues(now)
-            .setValueAtTime(modLfoToFilterFc, now);
-    }
     setDelayModLFO(note) {
         const now = this.audioContext.currentTime;
         const startTime = note.startTime;
@@ -948,7 +964,7 @@ class MidyGMLite {
                                 noteVoiceParams[key] = voiceParams[key];
                         }
                         this.setFilterEnvelope(channel, note);
-                        this.setPitch(channel, note);
+                        this.setPitchEnvelope(note);
                     }
                     else if (volumeEnvelopeKeySet.has(key)) {
                         if (appliedVolumeEnvelope)
@@ -1002,7 +1018,7 @@ class MidyGMLite {
                     note.modulationDepth.gain.setValueAtTime(channel.state.modulationDepth, now);
                 }
                 else {
-                    this.setPitch(channel, note);
+                    this.setPitchEnvelope(note);
                     this.startModulation(channel, note, now);
                 }
             }
@@ -1097,20 +1113,6 @@ class MidyGMLite {
         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);
@@ -1237,6 +1239,7 @@ Object.defineProperty(MidyGMLite, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        detune: 0,
         program: 0,
         bank: 0,
         dataMSB: 0,