spessasynth_lib 3.25.22 → 3.25.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.25.22",
+  "version": "3.25.23",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "type": "module",

package/sequencer/sequencer_engine/events.js

@@ -1,112 +1,9 @@
-import {
-    ALL_CHANNELS_OR_DIFFERENT_ACTION,
-    returnMessageType
-} from "../../synthetizer/audio_engine/message_protocol/worklet_message.js";
-import {
-    SongChangeType,
-    SpessaSynthSequencerMessageType,
-    SpessaSynthSequencerReturnMessageType
-} from "../worklet_wrapper/sequencer_message.js";
+import { returnMessageType } from "../../synthetizer/audio_engine/message_protocol/worklet_message.js";
+import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
 import { messageTypes, midiControllers } from "../../midi/midi_message.js";
 
 import { MIDI_CHANNEL_COUNT } from "../../synthetizer/synth_constants.js";
 
-/**
- * @param messageType {SpessaSynthSequencerMessageType}
- * @param messageData {any}
- * @this {SpessaSynthSequencer}
- */
-export function processMessage(messageType, messageData)
-{
-    switch (messageType)
-    {
-        default:
-            break;
-        
-        case SpessaSynthSequencerMessageType.loadNewSongList:
-            this.loadNewSongList(messageData[0], messageData[1]);
-            break;
-        
-        case SpessaSynthSequencerMessageType.pause:
-            this.pause();
-            break;
-        
-        case SpessaSynthSequencerMessageType.play:
-            this.play(messageData);
-            break;
-        
-        case SpessaSynthSequencerMessageType.stop:
-            this.stop();
-            break;
-        
-        case SpessaSynthSequencerMessageType.setTime:
-            this.currentTime = messageData;
-            break;
-        
-        case SpessaSynthSequencerMessageType.changeMIDIMessageSending:
-            this.sendMIDIMessages = messageData;
-            break;
-        
-        case SpessaSynthSequencerMessageType.setPlaybackRate:
-            this.playbackRate = messageData;
-            break;
-        
-        case SpessaSynthSequencerMessageType.setLoop:
-            const [loop, count] = messageData;
-            this.loop = loop;
-            if (count === ALL_CHANNELS_OR_DIFFERENT_ACTION)
-            {
-                this.loopCount = Infinity;
-            }
-            else
-            {
-                this.loopCount = count;
-            }
-            break;
-        
-        case SpessaSynthSequencerMessageType.changeSong:
-            switch (messageData[0])
-            {
-                case SongChangeType.forwards:
-                    this.nextSong();
-                    break;
-                
-                case SongChangeType.backwards:
-                    this.previousSong();
-                    break;
-                
-                case SongChangeType.shuffleOff:
-                    this.shuffleMode = false;
-                    this.songIndex = this.shuffledSongIndexes[this.songIndex];
-                    break;
-                
-                case SongChangeType.shuffleOn:
-                    this.shuffleMode = true;
-                    this.shuffleSongIndexes();
-                    this.songIndex = 0;
-                    this.loadCurrentSong();
-                    break;
-                
-                case SongChangeType.index:
-                    this.songIndex = messageData[1];
-                    this.loadCurrentSong();
-                    break;
-            }
-            break;
-        
-        case SpessaSynthSequencerMessageType.getMIDI:
-            this.post(SpessaSynthSequencerReturnMessageType.getMIDI, this.midiData);
-            break;
-        
-        case SpessaSynthSequencerMessageType.setSkipToFirstNote:
-            this.skipToFirstNoteOn = messageData;
-            break;
-        
-        case SpessaSynthSequencerMessageType.setPreservePlaybackState:
-            this.preservePlaybackState = messageData;
-    }
-}
-
 /**
  *
  * @param messageType {SpessaSynthSequencerReturnMessageType}

package/sequencer/sequencer_engine/sequencer_engine.js

@@ -6,7 +6,6 @@ import { _playTo, _recalculateStartTime, play, setTimeTicks } from "./play.js";
 import { messageTypes, midiControllers } from "../../midi/midi_message.js";
 import {
     post,
-    processMessage,
     sendMIDICC,
     sendMIDIMessage,
     sendMIDIPitchWheel,
@@ -317,7 +316,6 @@ SpessaSynthSequencer.prototype.sendMIDIPitchWheel = sendMIDIPitchWheel;
 SpessaSynthSequencer.prototype.assignMIDIPort = assignMIDIPort;
 
 SpessaSynthSequencer.prototype.post = post;
-SpessaSynthSequencer.prototype.processMessage = processMessage;
 
 SpessaSynthSequencer.prototype._processEvent = _processEvent;
 SpessaSynthSequencer.prototype._addNewMidiPort = _addNewMidiPort;

package/synthetizer/audio_engine/engine_components/{soundfont_manager/soundfont_manager.js → soundfont_manager.js}

@@ -1,7 +1,6 @@
-import { SpessaSynthWarn } from "../../../../utils/loggin.js";
-import { WorkletSoundfontManagerMessageType } from "./sfman_message.js";
-import { loadSoundFont } from "../../../../soundfont/load_soundfont.js";
-import { isXGDrums } from "../../../../utils/xg_hacks.js";
+import { SpessaSynthWarn } from "../../../utils/loggin.js";
+import { loadSoundFont } from "../../../soundfont/load_soundfont.js";
+import { isXGDrums } from "../../../utils/xg_hacks.js";
 
 /**
  * @typedef {Object} SoundFontType
@@ -70,31 +69,6 @@ export class WorkletSoundfontManager
         }
     }
     
-    /**
-     * @param type {WorkletSoundfontManagerMessageType}
-     * @param data {any}
-     */
-    handleMessage(type, data)
-    {
-        switch (type)
-        {
-            case WorkletSoundfontManagerMessageType.addNewSoundFont:
-                this.addNewSoundFont(data[0], data[1], data[2]);
-                break;
-            
-            case WorkletSoundfontManagerMessageType.reloadSoundFont:
-                this.reloadManager(data);
-                break;
-            
-            case WorkletSoundfontManagerMessageType.deleteSoundFont:
-                this.deleteSoundFont(data);
-                break;
-            
-            case WorkletSoundfontManagerMessageType.rearrangeSoundFonts:
-                this.rearrangeSoundFonts(data);
-        }
-    }
-    
     /**
      * Get the final preset list
      * @returns {{bank: number, presetName: string, program: number}[]}

package/synthetizer/audio_engine/engine_components/voice.js

@@ -313,9 +313,10 @@ class Voice
      * copies the voice
      * @param voice {Voice}
      * @param currentTime {number}
+     * @param realKey {number}
      * @returns Voice
      */
-    static copy(voice, currentTime)
+    static copy(voice, currentTime, realKey)
     {
         const sampleToCopy = voice.sample;
         const sample = new AudioSample(
@@ -336,7 +337,7 @@ class Voice
             voice.channelNumber,
             currentTime,
             voice.targetKey,
-            voice.realKey,
+            realKey,
             voice.generators,
             voice.modulators.map(m => Modulator.copy(m))
         );
@@ -403,11 +404,10 @@ export function getVoices(channel,
     }
     
     const cached = this.getCachedVoice(bank, program, midiNote, velocity);
-    
     // if cached, return it!
     if (cached !== undefined)
     {
-        return cached.map(v => Voice.copy(v, this.currentSynthTime));
+        return cached.map(v => Voice.copy(v, this.currentSynthTime, realKey));
     }
     
     // not cached...
@@ -514,6 +514,6 @@ export function getVoices(channel,
         }, []);
     // cache the voice
     this.setCachedVoice(bank, program, midiNote, velocity, voices.map(v =>
-        Voice.copy(v, this.currentSynthTime)));
+        Voice.copy(v, this.currentSynthTime, realKey)));
     return voices;
 }

package/synthetizer/audio_engine/engine_methods/controller_control/reset_controllers.js

@@ -109,7 +109,7 @@ export function resetAllControllers(log = true)
     }
     this.tunings = [];
     this.tunings = [];
-    for (let i = 0; 127 > i; i++)
+    for (let i = 0; i < 128; i++)
     {
         this.tunings.push([]);
     }

package/synthetizer/audio_engine/engine_methods/note_on.js

@@ -35,9 +35,10 @@ export function noteOn(midiNote, velocity)
         return;
     }
     const program = this.preset.program;
-    if (this.synth.tunings[program]?.[realKey]?.midiNote >= 0)
+    const tune = this.synth.tunings[program]?.[realKey]?.midiNote;
+    if (tune >= 0)
     {
-        sentMidiNote = this.synth.tunings[program]?.[realKey].midiNote;
+        sentMidiNote = tune;
     }
     
     // velocity override

package/synthetizer/audio_engine/engine_methods/system_exclusive.js

@@ -4,6 +4,7 @@ import { midiControllers } from "../../../midi/midi_message.js";
 import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from "../message_protocol/worklet_message.js";
 import { isSystemXG } from "../../../utils/xg_hacks.js";
 import { masterParameterType } from "./controller_control/master_parameters.js";
+import { readBytesAsString } from "../../../utils/byte_functions/string.js";
 
 /**
  * KeyNum: tuning
@@ -167,13 +168,44 @@ export function systemExclusive(messageData, channelOffset = 0)
                 // MIDI Tuning standard
                 // https://midi.org/midi-tuning-updated-specification
                 case 0x08:
+                    let currentMessageIndex = 4;
                     switch (messageData[3])
                     {
+                        // bulk tuning dump: all 128 notes
+                        case 0x01:
+                            const program = messageData[currentMessageIndex++];
+                            // read the name
+                            messageData.currentIndex = currentMessageIndex;
+                            const tuningName = readBytesAsString(messageData, 16);
+                            currentMessageIndex += 16;
+                            if (messageData.length < 384)
+                            {
+                                SpessaSynthWarn(`The Bulk Tuning Dump is too short! (${messageData.length} bytes, at least 384 are expected)`);
+                                return;
+                            }
+                            // 128 frequencies follow
+                            for (let i = 0; i < 128; i++)
+                            {
+                                // set the given tuning to the program
+                                this.tunings[program][i] = getTuning(
+                                    messageData[currentMessageIndex++],
+                                    messageData[currentMessageIndex++],
+                                    messageData[currentMessageIndex++]
+                                );
+                            }
+                            SpessaSynthInfo(
+                                `%cBulk Tuning Dump %c${tuningName}%c Program: %c${program}`,
+                                consoleColors.info,
+                                consoleColors.value,
+                                consoleColors.info,
+                                consoleColors.recognized
+                            );
+                            break;
+                        
                         // single note change
                         // single note change bank
                         case 0x02:
                         case 0x07:
-                            let currentMessageIndex = 4;
                             if (messageData[3] === 0x07)
                             {
                                 // skip the bank

package/synthetizer/audio_engine/main_processor.js

@@ -9,7 +9,7 @@ import { callEvent } from "./message_protocol/message_sending.js";
 import { systemExclusive } from "./engine_methods/system_exclusive.js";
 import { masterParameterType, setMasterParameter } from "./engine_methods/controller_control/master_parameters.js";
 import { resetAllControllers } from "./engine_methods/controller_control/reset_controllers.js";
-import { WorkletSoundfontManager } from "./engine_components/soundfont_manager/soundfont_manager.js";
+import { WorkletSoundfontManager } from "./engine_components/soundfont_manager.js";
 import { interpolationTypes } from "./engine_components/wavetable_oscillator.js";
 import { KeyModifierManager } from "./engine_components/key_modifier_manager.js";
 import { getVoices } from "./engine_components/voice.js";
@@ -269,7 +269,7 @@ class SpessaSynthProcessor
         this.enableEventSystem = enableEventSystem && typeof postCallback === "function";
         
         
-        for (let i = 0; i < 127; i++)
+        for (let i = 0; i < 128; i++)
         {
             this.tunings.push([]);
         }