spessasynth_lib 3.25.18 → 3.25.20

package/external_midi/midi_handler.js

@@ -1,4 +1,4 @@
-import { Synthetizer } from "../synthetizer/synthetizer.js";
+import { Synthetizer } from "../synthetizer/worklet_wrapper/synthetizer.js";
 import { consoleColors } from "../utils/other.js";
 import { SpessaSynthInfo, SpessaSynthWarn } from "../utils/loggin.js";
 

package/external_midi/web_midi_link.js

@@ -1,4 +1,4 @@
-import { Synthetizer } from "../synthetizer/synthetizer.js";
+import { Synthetizer } from "../synthetizer/worklet_wrapper/synthetizer.js";
 import { consoleColors } from "../utils/other.js";
 import { SpessaSynthInfo } from "../utils/loggin.js";
 

package/index.js

@@ -27,6 +27,8 @@ import { DEFAULT_SYNTH_CONFIG } from "./synthetizer/audio_effects/effects_config
 import { WORKLET_URL_ABSOLUTE } from './synthetizer/worklet_url.js';
 import { SynthesizerSnapshot} from "./synthetizer/worklet_system/snapshot/synthesizer_snapshot.js";
 import { ChannelSnapshot } from "./synthetizer/worklet_system/snapshot/channel_snapshot.js";
+import { NON_CC_INDEX_OFFSET } from "./synthetizer/worklet_system/worklet_utilities/controller_tables.js";
+import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from "./synthetizer/worklet_system/message_protocol/worklet_message.js";
 
 // Export modules
 export {
@@ -38,6 +40,8 @@ export {
     DEFAULT_PERCUSSION,
     VOICE_CAP,
     DEFAULT_SYNTH_CONFIG,
+    ALL_CHANNELS_OR_DIFFERENT_ACTION,
+    NON_CC_INDEX_OFFSET,
     
     // SoundFont
     BasicSoundBank,

package/midi_parser/midi_editor.js

@@ -3,7 +3,7 @@ import { IndexedByteArray } from "../utils/indexed_array.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils/loggin.js";
 import { consoleColors } from "../utils/other.js";
 
-import { customControllers } from "../synthetizer/worklet_system/worklet_utilities/controller_tables.js";
+import { customControllers } from "../synthetizer/audio_engine/worklet_utilities/controller_tables.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
 import { isGM2On, isGMOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
 import { isSystemXG, isXGDrums, XG_SFX_VOICE } from "../utils/xg_hacks.js";

package/package.json

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

package/sequencer/README.md

@@ -2,6 +2,8 @@
 
 The code here is responsible for playing back the parsed MIDI sequence with the synthesizer.
 
+- `sequencer_engine` - the core sequencer engine, currently runs in audio worklet
+
 ### Message protocol:
 
 #### Message structure

package/sequencer/{worklet_sequencer → sequencer_engine}/events.js

@@ -1,16 +1,20 @@
 import {
     ALL_CHANNELS_OR_DIFFERENT_ACTION,
     returnMessageType
-} from "../../synthetizer/worklet_system/message_protocol/worklet_message.js";
-import { SongChangeType, WorkletSequencerMessageType, WorkletSequencerReturnMessageType } from "./sequencer_message.js";
+} from "../../synthetizer/audio_engine/message_protocol/worklet_message.js";
+import {
+    SongChangeType,
+    SpessaSynthSequencerMessageType,
+    SpessaSynthSequencerReturnMessageType
+} from "../worklet_wrapper/sequencer_message.js";
 import { messageTypes, midiControllers } from "../../midi_parser/midi_message.js";
 
 import { MIDI_CHANNEL_COUNT } from "../../synthetizer/synth_constants.js";
 
 /**
- * @param messageType {WorkletSequencerMessageType}
+ * @param messageType {SpessaSynthSequencerMessageType}
  * @param messageData {any}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function processMessage(messageType, messageData)
 {
@@ -19,35 +23,35 @@ export function processMessage(messageType, messageData)
         default:
             break;
         
-        case WorkletSequencerMessageType.loadNewSongList:
+        case SpessaSynthSequencerMessageType.loadNewSongList:
             this.loadNewSongList(messageData[0], messageData[1]);
             break;
         
-        case WorkletSequencerMessageType.pause:
+        case SpessaSynthSequencerMessageType.pause:
             this.pause();
             break;
         
-        case WorkletSequencerMessageType.play:
+        case SpessaSynthSequencerMessageType.play:
             this.play(messageData);
             break;
         
-        case WorkletSequencerMessageType.stop:
+        case SpessaSynthSequencerMessageType.stop:
             this.stop();
             break;
         
-        case WorkletSequencerMessageType.setTime:
+        case SpessaSynthSequencerMessageType.setTime:
             this.currentTime = messageData;
             break;
         
-        case WorkletSequencerMessageType.changeMIDIMessageSending:
+        case SpessaSynthSequencerMessageType.changeMIDIMessageSending:
             this.sendMIDIMessages = messageData;
             break;
         
-        case WorkletSequencerMessageType.setPlaybackRate:
+        case SpessaSynthSequencerMessageType.setPlaybackRate:
             this.playbackRate = messageData;
             break;
         
-        case WorkletSequencerMessageType.setLoop:
+        case SpessaSynthSequencerMessageType.setLoop:
             const [loop, count] = messageData;
             this.loop = loop;
             if (count === ALL_CHANNELS_OR_DIFFERENT_ACTION)
@@ -60,7 +64,7 @@ export function processMessage(messageType, messageData)
             }
             break;
         
-        case WorkletSequencerMessageType.changeSong:
+        case SpessaSynthSequencerMessageType.changeSong:
             switch (messageData[0])
             {
                 case SongChangeType.forwards:
@@ -90,24 +94,24 @@ export function processMessage(messageType, messageData)
             }
             break;
         
-        case WorkletSequencerMessageType.getMIDI:
-            this.post(WorkletSequencerReturnMessageType.getMIDI, this.midiData);
+        case SpessaSynthSequencerMessageType.getMIDI:
+            this.post(SpessaSynthSequencerReturnMessageType.getMIDI, this.midiData);
             break;
         
-        case WorkletSequencerMessageType.setSkipToFirstNote:
+        case SpessaSynthSequencerMessageType.setSkipToFirstNote:
             this.skipToFirstNoteOn = messageData;
             break;
         
-        case WorkletSequencerMessageType.setPreservePlaybackState:
+        case SpessaSynthSequencerMessageType.setPreservePlaybackState:
             this.preservePlaybackState = messageData;
     }
 }
 
 /**
  *
- * @param messageType {WorkletSequencerReturnMessageType}
+ * @param messageType {SpessaSynthSequencerReturnMessageType}
  * @param messageData {any}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function post(messageType, messageData = undefined)
 {
@@ -126,15 +130,19 @@ export function post(messageType, messageData = undefined)
 
 /**
  * @param message {number[]}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function sendMIDIMessage(message)
 {
-    this.post(WorkletSequencerReturnMessageType.midiEvent, message);
+    if (!this.sendMIDIMessages)
+    {
+        return;
+    }
+    this.post(SpessaSynthSequencerReturnMessageType.midiEvent, message);
 }
 
 /**
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  * @param channel {number}
  * @param type {number}
  * @param value {number}
@@ -150,7 +158,7 @@ export function sendMIDICC(channel, type, value)
 }
 
 /**
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  * @param channel {number}
  * @param program {number}
  */
@@ -166,7 +174,7 @@ export function sendMIDIProgramChange(channel, program)
 
 /**
  * Sets the pitch of the given channel
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  * @param channel {number} usually 0-15: the channel to change pitch
  * @param MSB {number} SECOND byte of the MIDI pitchWheel message
  * @param LSB {number} FIRST byte of the MIDI pitchWheel message
@@ -182,7 +190,7 @@ export function sendMIDIPitchWheel(channel, MSB, LSB)
 }
 
 /**
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function sendMIDIReset()
 {

package/sequencer/{worklet_sequencer → sequencer_engine}/play.js

@@ -1,9 +1,9 @@
 import { getEvent, messageTypes, midiControllers } from "../../midi_parser/midi_message.js";
-import { WorkletSequencerReturnMessageType } from "./sequencer_message.js";
-import { resetArray } from "../../synthetizer/worklet_system/worklet_utilities/controller_tables.js";
+import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
+import { resetArray } from "../../synthetizer/audio_engine/worklet_utilities/controller_tables.js";
 import {
     nonResetableCCs
-} from "../../synthetizer/worklet_system/worklet_methods/controller_control/reset_controllers.js";
+} from "../../synthetizer/audio_engine/worklet_methods/controller_control/reset_controllers.js";
 
 
 // an array with preset default values
@@ -15,7 +15,7 @@ const defaultControllerArray = resetArray.slice(0, 128);
  * @param time {number} in seconds
  * @param ticks {number} optional MIDI ticks, when given is used instead of time
  * @returns {boolean} true if the midi file is not finished
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function _playTo(time, ticks = undefined)
 {
@@ -25,7 +25,7 @@ export function _playTo(time, ticks = undefined)
     this.sendMIDIReset();
     this._resetTimers();
     
-    const channelsToSave = this.synth.workletProcessorChannels.length;
+    const channelsToSave = this.synth.midiAudioChannels.length;
     /**
      * save pitch bends here and send them only after
      * @type {number[]}
@@ -281,7 +281,7 @@ export function _playTo(time, ticks = undefined)
 /**
  * Starts the playback
  * @param resetTime {boolean} If true, time is set to 0 s
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function play(resetTime = false)
 {
@@ -323,7 +323,7 @@ export function play(resetTime = false)
 }
 
 /**
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  * @param ticks {number}
  */
 export function setTimeTicks(ticks)
@@ -332,8 +332,8 @@ export function setTimeTicks(ticks)
     this.playingNotes = [];
     this.pausedTime = undefined;
     this.post(
-        WorkletSequencerReturnMessageType.timeChange,
-        currentTime - this.midiData.MIDIticksToSeconds(ticks)
+        SpessaSynthSequencerReturnMessageType.timeChange,
+        this.synth.currentSynthTime - this.midiData.MIDIticksToSeconds(ticks)
     );
     const isNotFinished = this._playTo(0, ticks);
     this._recalculateStartTime(this.playedTime);
@@ -347,9 +347,9 @@ export function setTimeTicks(ticks)
 /**
  * @param time
  * @private
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function _recalculateStartTime(time)
 {
-    this.absoluteStartTime = currentTime - time / this._playbackRate;
+    this.absoluteStartTime = this.synth.currentSynthTime - time / this._playbackRate;
 }

package/sequencer/{worklet_sequencer → sequencer_engine}/process_event.js

@@ -1,5 +1,5 @@
 import { getEvent, messageTypes } from "../../midi_parser/midi_message.js";
-import { WorkletSequencerReturnMessageType } from "./sequencer_message.js";
+import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
 import { consoleColors } from "../../utils/other.js";
 import { SpessaSynthWarn } from "../../utils/loggin.js";
 import { readBytesAsUintBigEndian } from "../../utils/byte_functions/big_endian.js";
@@ -8,7 +8,7 @@ import { readBytesAsUintBigEndian } from "../../utils/byte_functions/big_endian.
  * Processes a single event
  * @param event {MIDIMessage}
  * @param trackIndex {number}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  * @private
  */
 export function _processEvent(event, trackIndex)
@@ -149,7 +149,7 @@ export function _processEvent(event, trackIndex)
     if (statusByteData.status >= 0 && statusByteData.status < 0x80)
     {
         this.post(
-            WorkletSequencerReturnMessageType.metaEvent,
+            SpessaSynthSequencerReturnMessageType.metaEvent,
             [event, trackIndex]
         );
     }
@@ -157,7 +157,7 @@ export function _processEvent(event, trackIndex)
 
 /**
  * Adds 16 channels to the synth
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  * @private
  */
 export function _addNewMidiPort()

package/sequencer/{worklet_sequencer → sequencer_engine}/process_tick.js

@@ -1,8 +1,8 @@
-import { WorkletSequencerReturnMessageType } from "./sequencer_message.js";
+import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
 
 /**
  * Processes a single tick
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function processTick()
 {
@@ -50,7 +50,7 @@ export function processTick()
             if (this.loopCount !== Infinity)
             {
                 this.loopCount--;
-                this.post(WorkletSequencerReturnMessageType.loopCountChange, this.loopCount);
+                this.post(SpessaSynthSequencerReturnMessageType.loopCountChange, this.loopCount);
             }
             this.setTimeTicks(this.midiData.loop.start);
             return;
@@ -64,7 +64,7 @@ export function processTick()
                 if (this.loopCount !== Infinity)
                 {
                     this.loopCount--;
-                    this.post(WorkletSequencerReturnMessageType.loopCountChange, this.loopCount);
+                    this.post(SpessaSynthSequencerReturnMessageType.loopCountChange, this.loopCount);
                 }
                 this.setTimeTicks(this.midiData.loop.start);
                 return;
@@ -84,7 +84,7 @@ export function processTick()
 
 /**
  * @returns {number} the index of the first to the current played time
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function _findFirstEventIndex()
 {

package/sequencer/{worklet_sequencer/worklet_sequencer.js → sequencer_engine/sequencer_engine.js}

@@ -1,4 +1,4 @@
-import { WorkletSequencerReturnMessageType } from "./sequencer_message.js";
+import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
 import { _addNewMidiPort, _processEvent } from "./process_event.js";
 import { _findFirstEventIndex, processTick } from "./process_tick.js";
 import { assignMIDIPort, loadNewSequence, loadNewSongList, nextSong, previousSong } from "./song_control.js";
@@ -17,7 +17,7 @@ import { SpessaSynthWarn } from "../../utils/loggin.js";
 
 import { MIDI_CHANNEL_COUNT } from "../../synthetizer/synth_constants.js";
 
-class WorkletSequencer
+class SpessaSynthSequencer
 {
     /**
      * All the sequencer's songs
@@ -83,7 +83,7 @@ class WorkletSequencer
      * Absolute playback startTime, bases on the synth's time
      * @type {number}
      */
-    absoluteStartTime = currentTime;
+    absoluteStartTime = 0;
     /**
      * Currently playing notes (for pausing and resuming)
      * @type {{
@@ -142,6 +142,7 @@ class WorkletSequencer
     constructor(spessasynthProcessor)
     {
         this.synth = spessasynthProcessor;
+        this.absoluteStartTime = this.synth.currentSynthTime;
     }
     
     /**
@@ -169,7 +170,7 @@ class WorkletSequencer
             return this.pausedTime;
         }
         
-        return (currentTime - this.absoluteStartTime) * this._playbackRate;
+        return (this.synth.currentSynthTime - this.absoluteStartTime) * this._playbackRate;
     }
     
     set currentTime(time)
@@ -199,11 +200,11 @@ class WorkletSequencer
         this.playingNotes = [];
         const wasPaused = this.paused && this.preservePlaybackState;
         this.pausedTime = undefined;
-        this.post(WorkletSequencerReturnMessageType.timeChange, currentTime - time);
+        this.post(SpessaSynthSequencerReturnMessageType.timeChange, this.synth.currentSynthTime - time);
         if (this.midiData.duration === 0)
         {
             SpessaSynthWarn("No duration!");
-            this.post(WorkletSequencerReturnMessageType.pause, true);
+            this.post(SpessaSynthSequencerReturnMessageType.pause, true);
             return;
         }
         this._playTo(time);
@@ -240,7 +241,7 @@ class WorkletSequencer
         }
         this.pausedTime = this.currentTime;
         this.stop();
-        this.post(WorkletSequencerReturnMessageType.pause, isFinished);
+        this.post(SpessaSynthSequencerReturnMessageType.pause, isFinished);
     }
     
     /**
@@ -308,29 +309,29 @@ class WorkletSequencer
 }
 
 // Web MIDI sending
-WorkletSequencer.prototype.sendMIDIMessage = sendMIDIMessage;
-WorkletSequencer.prototype.sendMIDIReset = sendMIDIReset;
-WorkletSequencer.prototype.sendMIDICC = sendMIDICC;
-WorkletSequencer.prototype.sendMIDIProgramChange = sendMIDIProgramChange;
-WorkletSequencer.prototype.sendMIDIPitchWheel = sendMIDIPitchWheel;
-WorkletSequencer.prototype.assignMIDIPort = assignMIDIPort;
+SpessaSynthSequencer.prototype.sendMIDIMessage = sendMIDIMessage;
+SpessaSynthSequencer.prototype.sendMIDIReset = sendMIDIReset;
+SpessaSynthSequencer.prototype.sendMIDICC = sendMIDICC;
+SpessaSynthSequencer.prototype.sendMIDIProgramChange = sendMIDIProgramChange;
+SpessaSynthSequencer.prototype.sendMIDIPitchWheel = sendMIDIPitchWheel;
+SpessaSynthSequencer.prototype.assignMIDIPort = assignMIDIPort;
 
-WorkletSequencer.prototype.post = post;
-WorkletSequencer.prototype.processMessage = processMessage;
+SpessaSynthSequencer.prototype.post = post;
+SpessaSynthSequencer.prototype.processMessage = processMessage;
 
-WorkletSequencer.prototype._processEvent = _processEvent;
-WorkletSequencer.prototype._addNewMidiPort = _addNewMidiPort;
-WorkletSequencer.prototype.processTick = processTick;
-WorkletSequencer.prototype._findFirstEventIndex = _findFirstEventIndex;
+SpessaSynthSequencer.prototype._processEvent = _processEvent;
+SpessaSynthSequencer.prototype._addNewMidiPort = _addNewMidiPort;
+SpessaSynthSequencer.prototype.processTick = processTick;
+SpessaSynthSequencer.prototype._findFirstEventIndex = _findFirstEventIndex;
 
-WorkletSequencer.prototype.loadNewSequence = loadNewSequence;
-WorkletSequencer.prototype.loadNewSongList = loadNewSongList;
-WorkletSequencer.prototype.nextSong = nextSong;
-WorkletSequencer.prototype.previousSong = previousSong;
+SpessaSynthSequencer.prototype.loadNewSequence = loadNewSequence;
+SpessaSynthSequencer.prototype.loadNewSongList = loadNewSongList;
+SpessaSynthSequencer.prototype.nextSong = nextSong;
+SpessaSynthSequencer.prototype.previousSong = previousSong;
 
-WorkletSequencer.prototype.play = play;
-WorkletSequencer.prototype._playTo = _playTo;
-WorkletSequencer.prototype.setTimeTicks = setTimeTicks;
-WorkletSequencer.prototype._recalculateStartTime = _recalculateStartTime;
+SpessaSynthSequencer.prototype.play = play;
+SpessaSynthSequencer.prototype._playTo = _playTo;
+SpessaSynthSequencer.prototype.setTimeTicks = setTimeTicks;
+SpessaSynthSequencer.prototype._recalculateStartTime = _recalculateStartTime;
 
-export { WorkletSequencer };
+export { SpessaSynthSequencer };

package/sequencer/{worklet_sequencer → sequencer_engine}/song_control.js

@@ -1,4 +1,4 @@
-import { WorkletSequencerReturnMessageType } from "./sequencer_message.js";
+import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
 import { consoleColors, formatTime } from "../../utils/other.js";
 import {
     SpessaSynthGroupCollapsed,
@@ -14,7 +14,7 @@ import { BasicMIDI } from "../../midi_parser/basic_midi.js";
 /**
  * @param trackNum {number}
  * @param port {number}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function assignMIDIPort(trackNum, port)
 {
@@ -33,7 +33,7 @@ export function assignMIDIPort(trackNum, port)
     
     if (this.midiPortChannelOffsets[port] === undefined)
     {
-        if (this.synth.workletProcessorChannels.length < this.midiPortChannelOffset + 15)
+        if (this.synth.midiAudioChannels.length < this.midiPortChannelOffset + 15)
         {
             this._addNewMidiPort();
         }
@@ -48,7 +48,7 @@ export function assignMIDIPort(trackNum, port)
  * Loads a new sequence
  * @param parsedMidi {BasicMIDI}
  * @param autoPlay {boolean}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function loadNewSequence(parsedMidi, autoPlay = true)
 {
@@ -127,7 +127,7 @@ export function loadNewSequence(parsedMidi, autoPlay = true)
     this.firstNoteTime = this.midiData.MIDIticksToSeconds(this.midiData.firstNoteOn);
     SpessaSynthInfo(`%cTotal song time: ${formatTime(Math.ceil(this.duration)).time}`, consoleColors.recognized);
     
-    this.post(WorkletSequencerReturnMessageType.songChange, [this.songIndex, autoPlay]);
+    this.post(SpessaSynthSequencerReturnMessageType.songChange, [this.songIndex, autoPlay]);
     
     if (this.duration <= 1)
     {
@@ -153,7 +153,7 @@ export function loadNewSequence(parsedMidi, autoPlay = true)
 /**
  * @param midiBuffers {MIDIFile[]}
  * @param autoPlay {boolean}
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function loadNewSongList(midiBuffers, autoPlay = true)
 {
@@ -175,7 +175,7 @@ export function loadNewSongList(midiBuffers, autoPlay = true)
         catch (e)
         {
             console.error(e);
-            this.post(WorkletSequencerReturnMessageType.midiError, e);
+            this.post(SpessaSynthSequencerReturnMessageType.midiError, e);
             return mids;
         }
         return mids;
@@ -191,12 +191,12 @@ export function loadNewSongList(midiBuffers, autoPlay = true)
     }
     this.shuffleSongIndexes();
     const midiDatas = this.songs.map(s => new MIDIData(s));
-    this.post(WorkletSequencerReturnMessageType.songListChange, midiDatas);
+    this.post(SpessaSynthSequencerReturnMessageType.songListChange, midiDatas);
     this.loadCurrentSong(autoPlay);
 }
 
 /**
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function nextSong()
 {
@@ -211,7 +211,7 @@ export function nextSong()
 }
 
 /**
- * @this {WorkletSequencer}
+ * @this {SpessaSynthSequencer}
  */
 export function previousSong()
 {