@marmooo/midy 0.2.0 → 0.2.1

package/script/midy.d.ts

@@ -1,6 +1,8 @@
 export class Midy {
     static channelSettings: {
         currentBufferSource: null;
+        detune: number;
+        scaleOctaveTuningTable: any[];
         program: number;
         bank: number;
         bankMSB: number;
@@ -192,12 +194,15 @@ export class Midy {
         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;
     setPortamentoStartVolumeEnvelope(channel: any, note: any): void;
     setVolumeEnvelope(channel: any, note: any): void;
-    setPlaybackRate(note: any): void;
-    setPitch(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;
@@ -219,11 +224,11 @@ export class Midy {
     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;
     setChorusEffectsSend(note: any, prevValue: any): void;
     setReverbEffectsSend(note: any, prevValue: any): void;
-    setVibLfoToPitch(channel: any, note: any): void;
-    setModLfoToFilterFc(note: any): void;
     setDelayModLFO(note: any): void;
     setFreqModLFO(note: any): void;
     createVoiceParamsHandlers(): {
@@ -293,8 +298,6 @@ export class Midy {
     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;
     setFilterResonance(channelNumber: any, filterResonance: any): void;
@@ -305,6 +308,8 @@ export class Midy {
     setVibratoRate(channelNumber: any, vibratoRate: any): void;
     setVibratoDepth(channelNumber: any, vibratoDepth: any): void;
     setVibratoDelay(channelNumber: any, vibratoDelay: 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, value: any): void;
@@ -313,13 +318,12 @@ export class Midy {
     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>;
@@ -336,9 +340,11 @@ export class Midy {
     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;
+    getChannelBitmap(data: any): any[];
+    handleScaleOctaveTuning1ByteFormat(data: any): void;
     handleGlobalParameterControlSysEx(data: any): void;
     handleReverbParameterSysEx(data: any): void;
     setReverbType(type: any): void;

package/script/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}

package/script/midy.js

@@ -907,16 +907,41 @@ class Midy {
     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 masterTuning = this.masterCoarseTuning + this.masterFineTuning;
         const channelTuning = channel.coarseTuning + channel.fineTuning;
+        const tuning = masterTuning + channelTuning;
         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;
@@ -948,32 +973,28 @@ class Midy {
             .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
@@ -1084,9 +1105,8 @@ class Midy {
         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) {
@@ -1220,11 +1240,12 @@ class Midy {
             }
             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);
             }
         }
@@ -1329,10 +1350,11 @@ class Midy {
     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) {
@@ -1345,6 +1367,23 @@ class Midy {
             .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;
@@ -1404,23 +1443,6 @@ class Midy {
             }
         }
     }
-    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;
@@ -1529,7 +1551,7 @@ class Midy {
                         else {
                             this.setFilterEnvelope(channel, note);
                         }
-                        this.setPitch(channel, note);
+                        this.setPitchEnvelope(note);
                     }
                     else if (volumeEnvelopeKeySet.has(key)) {
                         if (appliedVolumeEnvelope)
@@ -1611,7 +1633,7 @@ class Midy {
                     note.modulationDepth.gain.setValueAtTime(channel.state.modulationDepth, now);
                 }
                 else {
-                    this.setPitch(channel, note);
+                    this.setPitchEnvelope(note);
                     this.startModulation(channel, note, now);
                 }
             }
@@ -1678,88 +1700,6 @@ class Midy {
     setPortamento(channelNumber, value) {
         this.channels[channelNumber].state.portamento = value / 127;
     }
-    setReverbSendLevel(channelNumber, reverbSendLevel) {
-        const channel = this.channels[channelNumber];
-        const state = channel.state;
-        const reverbEffect = this.reverbEffect;
-        if (0 < state.reverbSendLevel) {
-            if (0 < reverbSendLevel) {
-                const now = this.audioContext.currentTime;
-                state.reverbSendLevel = reverbSendLevel / 127;
-                reverbEffect.input.gain.cancelScheduledValues(now);
-                reverbEffect.input.gain.setValueAtTime(state.reverbSendLevel, now);
-            }
-            else {
-                channel.scheduledNotes.forEach((noteList) => {
-                    for (let i = 0; i < noteList.length; i++) {
-                        const note = noteList[i];
-                        if (!note)
-                            continue;
-                        if (note.voiceParams.reverbEffectsSend <= 0)
-                            continue;
-                        note.reverbEffectsSend.disconnect();
-                    }
-                });
-            }
-        }
-        else {
-            if (0 < reverbSendLevel) {
-                const now = this.audioContext.currentTime;
-                channel.scheduledNotes.forEach((noteList) => {
-                    for (let i = 0; i < noteList.length; i++) {
-                        const note = noteList[i];
-                        if (!note)
-                            continue;
-                        this.setReverbEffectsSend(note, 0);
-                    }
-                });
-                state.reverbSendLevel = reverbSendLevel / 127;
-                reverbEffect.input.gain.cancelScheduledValues(now);
-                reverbEffect.input.gain.setValueAtTime(state.reverbSendLevel, now);
-            }
-        }
-    }
-    setChorusSendLevel(channelNumber, chorusSendLevel) {
-        const channel = this.channels[channelNumber];
-        const state = channel.state;
-        const chorusEffect = this.chorusEffect;
-        if (0 < state.chorusSendLevel) {
-            if (0 < chorusSendLevel) {
-                const now = this.audioContext.currentTime;
-                state.chorusSendLevel = chorusSendLevel / 127;
-                chorusEffect.input.gain.cancelScheduledValues(now);
-                chorusEffect.input.gain.setValueAtTime(state.chorusSendLevel, now);
-            }
-            else {
-                channel.scheduledNotes.forEach((noteList) => {
-                    for (let i = 0; i < noteList.length; i++) {
-                        const note = noteList[i];
-                        if (!note)
-                            continue;
-                        if (note.voiceParams.chorusEffectsSend <= 0)
-                            continue;
-                        note.chorusEffectsSend.disconnect();
-                    }
-                });
-            }
-        }
-        else {
-            if (0 < chorusSendLevel) {
-                const now = this.audioContext.currentTime;
-                channel.scheduledNotes.forEach((noteList) => {
-                    for (let i = 0; i < noteList.length; i++) {
-                        const note = noteList[i];
-                        if (!note)
-                            continue;
-                        this.setChorusEffectsSend(note, 0);
-                    }
-                });
-                state.chorusSendLevel = chorusSendLevel / 127;
-                chorusEffect.input.gain.cancelScheduledValues(now);
-                chorusEffect.input.gain.setValueAtTime(state.chorusSendLevel, now);
-            }
-        }
-    }
     setSostenutoPedal(channelNumber, value) {
         const channel = this.channels[channelNumber];
         channel.state.sostenutoPedal = value / 127;
@@ -1855,6 +1795,88 @@ class Midy {
         const channel = this.channels[channelNumber];
         channel.state.vibratoDelay = vibratoDelay / 64;
     }
+    setReverbSendLevel(channelNumber, reverbSendLevel) {
+        const channel = this.channels[channelNumber];
+        const state = channel.state;
+        const reverbEffect = this.reverbEffect;
+        if (0 < state.reverbSendLevel) {
+            if (0 < reverbSendLevel) {
+                const now = this.audioContext.currentTime;
+                state.reverbSendLevel = reverbSendLevel / 127;
+                reverbEffect.input.gain.cancelScheduledValues(now);
+                reverbEffect.input.gain.setValueAtTime(state.reverbSendLevel, now);
+            }
+            else {
+                channel.scheduledNotes.forEach((noteList) => {
+                    for (let i = 0; i < noteList.length; i++) {
+                        const note = noteList[i];
+                        if (!note)
+                            continue;
+                        if (note.voiceParams.reverbEffectsSend <= 0)
+                            continue;
+                        note.reverbEffectsSend.disconnect();
+                    }
+                });
+            }
+        }
+        else {
+            if (0 < reverbSendLevel) {
+                const now = this.audioContext.currentTime;
+                channel.scheduledNotes.forEach((noteList) => {
+                    for (let i = 0; i < noteList.length; i++) {
+                        const note = noteList[i];
+                        if (!note)
+                            continue;
+                        this.setReverbEffectsSend(note, 0);
+                    }
+                });
+                state.reverbSendLevel = reverbSendLevel / 127;
+                reverbEffect.input.gain.cancelScheduledValues(now);
+                reverbEffect.input.gain.setValueAtTime(state.reverbSendLevel, now);
+            }
+        }
+    }
+    setChorusSendLevel(channelNumber, chorusSendLevel) {
+        const channel = this.channels[channelNumber];
+        const state = channel.state;
+        const chorusEffect = this.chorusEffect;
+        if (0 < state.chorusSendLevel) {
+            if (0 < chorusSendLevel) {
+                const now = this.audioContext.currentTime;
+                state.chorusSendLevel = chorusSendLevel / 127;
+                chorusEffect.input.gain.cancelScheduledValues(now);
+                chorusEffect.input.gain.setValueAtTime(state.chorusSendLevel, now);
+            }
+            else {
+                channel.scheduledNotes.forEach((noteList) => {
+                    for (let i = 0; i < noteList.length; i++) {
+                        const note = noteList[i];
+                        if (!note)
+                            continue;
+                        if (note.voiceParams.chorusEffectsSend <= 0)
+                            continue;
+                        note.chorusEffectsSend.disconnect();
+                    }
+                });
+            }
+        }
+        else {
+            if (0 < chorusSendLevel) {
+                const now = this.audioContext.currentTime;
+                channel.scheduledNotes.forEach((noteList) => {
+                    for (let i = 0; i < noteList.length; i++) {
+                        const note = noteList[i];
+                        if (!note)
+                            continue;
+                        this.setChorusEffectsSend(note, 0);
+                    }
+                });
+                state.chorusSendLevel = chorusSendLevel / 127;
+                chorusEffect.input.gain.cancelScheduledValues(now);
+                chorusEffect.input.gain.setValueAtTime(state.chorusSendLevel, now);
+            }
+        }
+    }
     limitData(channel, minMSB, maxMSB, minLSB, maxLSB) {
         if (maxLSB < channel.dataLSB) {
             channel.dataMSB++;
@@ -1923,59 +1945,49 @@ class Midy {
         this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber, 0);
     }
-    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];
@@ -2035,6 +2047,15 @@ class Midy {
     }
     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:
@@ -2091,9 +2112,10 @@ class Midy {
                 break;
             case 8:
                 switch (data[3]) {
-                    // case 8:
-                    //   // TODO
-                    //   return this.handleScaleOctaveTuning1ByteFormat();
+                    case 8:
+                        // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca21.pdf
+                        // TODO: realtime
+                        return this.handleScaleOctaveTuning1ByteFormat(data);
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
@@ -2138,27 +2160,59 @@ class Midy {
         }
     }
     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) {
@@ -2379,6 +2433,8 @@ Object.defineProperty(Midy, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        detune: 0,
+        scaleOctaveTuningTable: new Array(12).fill(0), // cent
         program: 0,
         bank: 121 * 128,
         bankMSB: 121,