spessasynth_lib 3.14.1 → 3.14.2

package/synthetizer/worklet_system/main_processor.js

@@ -57,6 +57,16 @@ export class SpessaSynthProcessor extends AudioWorkletProcessor
 
         this.transposition = 0;
 
+        /**
+         * this.tunings[program][key] = tuning
+         * @type {MTSProgramTuning[]}
+         */
+        this.tunings = [];
+        for (let i = 0; i < 127; i++)
+        {
+            this.tunings.push([]);
+        }
+
         /**
          * Bank offset for things like embedded RMIDIS. Added for every program change
          * @type {number}

package/synthetizer/worklet_system/worklet_methods/note_on.js

@@ -31,17 +31,22 @@ export function noteOn(channel, midiNote, velocity, enableDebugging = false, sen
         return;
     }
 
-    midiNote += channelObject.channelTransposeKeyShift;
+    let sentMidiNote = midiNote + channelObject.channelTransposeKeyShift;
 
     if(midiNote > 127 || midiNote < 0)
     {
         return;
     }
+    const program = channelObject.preset.program;
+    if(this.tunings[program][midiNote]?.midiNote >= 0)
+    {
+        sentMidiNote = this.tunings[program][midiNote].midiNote;
+    }
 
     // get voices
     const voices = getWorkletVoices(
         channel,
-        midiNote,
+        sentMidiNote,
         velocity,
         channelObject.preset,
         startTime,
@@ -89,7 +94,7 @@ export function noteOn(channel, midiNote, velocity, enableDebugging = false, sen
     {
         this.sendChannelProperties();
         this.callEvent("noteon", {
-            midiNote: midiNote - channelObject.channelTransposeKeyShift,
+            midiNote: midiNote,
             channel: channel,
             velocity: velocity,
         });

package/synthetizer/worklet_system/worklet_methods/reset_controllers.js

@@ -100,6 +100,13 @@ export function resetAllControllers()
             })
         }
     }
+    this.tunings = [];
+    this.tunings = [];
+    for (let i = 0; i < 127; i++)
+    {
+        this.tunings.push([]);
+    }
+
     this.setMIDIVolume(1);
     this.system = DEFAULT_SYNTH_MODE;
 }

package/synthetizer/worklet_system/worklet_methods/system_exclusive.js

@@ -3,34 +3,37 @@ import { SpessaSynthInfo, SpessaSynthWarn } from '../../../utils/loggin.js'
 import { midiControllers } from '../../../midi_parser/midi_message.js'
 import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from '../message_protocol/worklet_message.js'
 
+/**
+ * KeyNum: tuning
+ * @typedef {MTSNoteTuning[]} MTSProgramTuning
+ */
+
+/**
+ * @typedef {Object} MTSNoteTuning
+ * @property {number} midiNote - the base midi note to use, -1 means no change
+ * @property {number} centTuning - additional tuning
+ */
 
 /**
  * Calculates freqency for MIDI Tuning Standard
  * @param byte1 {number}
  * @param byte2 {number}
  * @param byte3 {number}
- * @return {number|null}
+ * @return {{midiNote: number, centTuning: number|null}}
  */
-function calculateFrequency(byte1, byte2, byte3)
+function getTuning(byte1, byte2, byte3)
 {
-    // handle special case of "no change"
+    const midiNote = byte1;
+    const fraction = (byte2 << 7) | byte3; // Combine byte2 and byte3 into a 14-bit number
+
+    // no change
     if (byte1 === 0x7F && byte2 === 0x7F && byte3 === 0x7F)
     {
-        return null;
+        return { midiNote: -1, centTuning: null };
     }
 
-    // Frequency base for MIDI note number 0
-    const baseFrequency = 8.1758;
-
-    const semitone = byte1;
-
-    // combine byte2 and byte3
-    const fraction = (byte2 << 7) | byte3;
-
-    // get total cents
-    const totalCents = semitone * 100 + (fraction / 16384) * 100;
-
-    return baseFrequency * Math.pow(2, totalCents / 1200);
+    // calculate cent tuning
+    return { midiNote: midiNote, centTuning: fraction * 0.0061 };
 }
 
 
@@ -144,26 +147,32 @@ export function systemExclusive(messageData, channelOffset = 0)
                     switch(messageData[3])
                     {
                         // single note change
+                        // single note change bank
                         case 0x02:
-                            const tuningProgram = messageData[4];
-                            const numberOfChanges = messageData[5];
-                            const keys = [];
-                            let currentMessageIndex = 6
-                            for (let i = 0; i < numberOfChanges; i++)
+                        case 0x07:
+                            let currentMessageIndex = 4;
+                            if(messageData[3] === 0x07)
                             {
-                                keys.push(messageData[currentMessageIndex]);
+                                // skip bank
                                 currentMessageIndex++;
                             }
-                            const frequencies = [];
+                            // get program and number of cahnges
+                            const tuningProgram = messageData[currentMessageIndex++];
+                            const numberOfChanges = messageData[currentMessageIndex++];
                             for (let i = 0; i < numberOfChanges; i++)
                             {
-                                frequencies.push(calculateFrequency(
+                                // set the given tuning to the program
+                                this.tunings[tuningProgram][messageData[currentMessageIndex++]] = getTuning(
                                     messageData[currentMessageIndex++],
                                     messageData[currentMessageIndex++],
                                     messageData[currentMessageIndex++],
-                                ));
+                                );
                             }
-                            console.log(tuningProgram, numberOfChanges, keys, frequencies)
+                            SpessaSynthInfo(`%cSingle Note Tuning. Program: %c${tuningProgram}%c Keys affected: ${numberOfChanges}`,
+                                consoleColors.info,
+                                consoleColors.recognized,
+                                consoleColors.info,
+                                consoleColors.recognized)
                             break;
 
                         // octave tuning (1 byte)
@@ -250,7 +259,6 @@ export function systemExclusive(messageData, channelOffset = 0)
         // http://www.bandtrax.com.au/sysex.htm
         // https://cdn.roland.com/assets/media/pdf/AT-20R_30R_MI.pdf
         case 0x41:
-            // messagedata[1] is device id (ignore as we're everything >:) )
             if(messageData[2] === 0x42 && messageData[3] === 0x12)
             {
                 // this is a GS sysex

package/synthetizer/worklet_system/worklet_methods/voice_control.js

@@ -55,6 +55,7 @@ export function renderVoice(
     }
 
     // TUNING
+    let targetKey = voice.targetKey;
 
     // calculate tuning
     let cents = voice.modulatedGenerators[generatorTypes.fineTune]
@@ -65,8 +66,16 @@ export function renderVoice(
     let semitones = voice.modulatedGenerators[generatorTypes.coarseTune]
         + channel.customControllers[customControllers.channelTuningSemitones];
 
+    // midi tuning standard
+    const tuning = this.tunings[channel.preset.program][targetKey];
+    if(tuning?.midiNote >= 0)
+    {
+        targetKey = tuning.midiNote;
+        cents += tuning.centTuning;
+    }
+
     // calculate tuning by key
-    cents += (voice.targetKey - voice.sample.rootKey) * voice.modulatedGenerators[generatorTypes.scaleTuning];
+    cents += (targetKey - voice.sample.rootKey) * voice.modulatedGenerators[generatorTypes.scaleTuning];
 
     // vibrato LFO
     const vibratoDepth = voice.modulatedGenerators[generatorTypes.vibLfoToPitch];