spessasynth_lib 3.25.21 → 3.25.23

package/index.js

@@ -8,18 +8,18 @@ import { Generator } from "./soundfont/basic_soundfont/generator.js";
 import { Modulator } from "./soundfont/basic_soundfont/modulator.js";
 import { BasicPresetZone } from "./soundfont/basic_soundfont/basic_zones.js";
 import { BasicPreset } from "./soundfont/basic_soundfont/basic_preset.js";
-import { BasicMIDI } from "./midi_parser/basic_midi.js";
-import { MIDIMessage } from "./midi_parser/midi_message.js";
-import { MIDI } from './midi_parser/midi_loader.js';
-import { RMIDINFOChunks } from "./midi_parser/rmidi_writer.js";
-import { MIDIBuilder } from "./midi_parser/midi_builder.js";
+import { BasicMIDI } from "./midi/basic_midi.js";
+import { MIDIMessage } from "./midi/midi_message.js";
+import { MIDI } from "./midi/midi_loader.js";
+import { RMIDINFOChunks } from "./midi/midi_tools/rmidi_writer.js";
+import { MIDIBuilder } from "./midi/midi_builder.js";
 import { Synthetizer } from "./synthetizer/worklet_wrapper/synthetizer.js";
 import { VOICE_CAP, DEFAULT_PERCUSSION } from "./synthetizer/synth_constants.js";
 import { Sequencer } from "./sequencer/worklet_wrapper/sequencer.js";
 import { IndexedByteArray } from './utils/indexed_array.js';
 import { audioBufferToWav } from './utils/buffer_to_wav.js';
 import { SpessaSynthLogging } from './utils/loggin.js';
-import { midiControllers, messageTypes } from './midi_parser/midi_message.js';
+import { midiControllers, messageTypes } from "./midi/midi_message.js";
 import { MIDIDeviceHandler} from "./external_midi/midi_handler.js";
 import { WebMIDILinkHandler} from "./external_midi/web_midi_link.js";
 import { modulatorSources } from "./soundfont/basic_soundfont/modulator.js";
@@ -28,7 +28,7 @@ import { WORKLET_URL_ABSOLUTE } from "./synthetizer/worklet_wrapper/worklet_url.
 import { SynthesizerSnapshot } from "./synthetizer/audio_engine/snapshot/synthesizer_snapshot.js";
 import { ChannelSnapshot } from "./synthetizer/audio_engine/snapshot/channel_snapshot.js";
 import { SpessaSynthProcessor } from "./synthetizer/audio_engine/main_processor.js";
-import { NON_CC_INDEX_OFFSET } from "./synthetizer/audio_engine/worklet_utilities/controller_tables.js";
+import { NON_CC_INDEX_OFFSET } from "./synthetizer/audio_engine/engine_components/controller_tables.js";
 import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from "./synthetizer/audio_engine/message_protocol/worklet_message.js";
 
 // Export modules

package/{midi_parser → midi}/basic_midi.js

@@ -4,11 +4,12 @@ import { messageTypes, MIDIMessage } from "./midi_message.js";
 import { readBytesAsUintBigEndian } from "../utils/byte_functions/big_endian.js";
 import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils/loggin.js";
 import { consoleColors, formatTitle, sanitizeKarLyrics } from "../utils/other.js";
-import { writeMIDI } from "./midi_writer.js";
-import { applySnapshotToMIDI, modifyMIDI } from "./midi_editor.js";
-import { writeRMIDI } from "./rmidi_writer.js";
-import { getUsedProgramsAndKeys } from "./used_keys_loaded.js";
+import { writeMIDI } from "./midi_tools/midi_writer.js";
+import { applySnapshotToMIDI, modifyMIDI } from "./midi_tools/midi_editor.js";
+import { writeRMIDI } from "./midi_tools/rmidi_writer.js";
+import { getUsedProgramsAndKeys } from "./midi_tools/used_keys_loaded.js";
 import { IndexedByteArray } from "../utils/indexed_array.js";
+import { getNoteTimes } from "./midi_tools/get_note_times.js";
 
 /**
  * BasicMIDI is the base of a complete MIDI file, used by the sequencer internally.
@@ -559,5 +560,6 @@ BasicMIDI.prototype.modifyMIDI = modifyMIDI;
 BasicMIDI.prototype.applySnapshotToMIDI = applySnapshotToMIDI;
 BasicMIDI.prototype.writeRMIDI = writeRMIDI;
 BasicMIDI.prototype.getUsedProgramsAndKeys = getUsedProgramsAndKeys;
+BasicMIDI.prototype.getNoteTimes = getNoteTimes;
 
 export { BasicMIDI };

package/{midi_parser → midi}/midi_loader.js

@@ -7,7 +7,7 @@ import { readVariableLengthQuantity } from "../utils/byte_functions/variable_len
 import { readBytesAsUintBigEndian } from "../utils/byte_functions/big_endian.js";
 import { readBytesAsString } from "../utils/byte_functions/string.js";
 import { readLittleEndian } from "../utils/byte_functions/little_endian.js";
-import { RMIDINFOChunks } from "./rmidi_writer.js";
+import { RMIDINFOChunks } from "./midi_tools/rmidi_writer.js";
 import { BasicMIDI } from "./basic_midi.js";
 import { loadXMF } from "./xmf_loader.js";
 

package/midi/midi_tools/get_note_times.js

@@ -0,0 +1,154 @@
+import { IndexedByteArray } from "../../utils/indexed_array.js";
+import { readBytesAsUintBigEndian } from "../../utils/byte_functions/big_endian.js";
+import { DEFAULT_PERCUSSION } from "../../synthetizer/synth_constants.js";
+
+/**
+ * Calculates all note times in seconds.
+ * @this {BasicMIDI}
+ * @param minDrumLength {number} the shortest a drum note (channel 10) can be, in seconds.
+ * @returns {{
+ *          midiNote: number,
+ *          start: number,
+ *          length: number,
+ *          velocity: number,
+ *      }[][]} an array of 16 channels, each channel containing its notes,
+ *      with their key number, velocity, absolute start time and length in seconds.
+ */
+export function getNoteTimes(minDrumLength = 0)
+{
+    
+    /**
+     * gets tempo from the midi message
+     * @param event {MIDIMessage}
+     * @return {number} the tempo in bpm
+     */
+    function getTempo(event)
+    {
+        // simulate IndexedByteArray
+        event.messageData = new IndexedByteArray(event.messageData.buffer);
+        event.messageData.currentIndex = 0;
+        return 60000000 / readBytesAsUintBigEndian(event.messageData, 3);
+    }
+    
+    /**
+     * an array of 16 arrays (channels)
+     * @type {{
+     *          midiNote: number,
+     *          start: number,
+     *          length: number,
+     *          velocity: number,
+     *      }[][]}
+     */
+    const noteTimes = [];
+    // flatten and sort by ticks
+    const trackData = this.tracks;
+    let events = trackData.flat();
+    events.sort((e1, e2) => e1.ticks - e2.ticks);
+    
+    for (let i = 0; i < 16; i++)
+    {
+        noteTimes.push([]);
+    }
+    let elapsedTime = 0;
+    let oneTickToSeconds = 60 / (120 * this.timeDivision);
+    let eventIndex = 0;
+    let unfinished = 0;
+    /**
+     * @type {{
+     *          midiNote: number,
+     *          start: number,
+     *          length: number,
+     *          velocity: number,
+     *      }[][]}
+     */
+    const unfinishedNotes = [];
+    for (let i = 0; i < 16; i++)
+    {
+        unfinishedNotes.push([]);
+    }
+    const noteOff = (midiNote, channel) =>
+    {
+        const noteIndex = unfinishedNotes[channel].findIndex(n => n.midiNote === midiNote);
+        const note = unfinishedNotes[channel][noteIndex];
+        if (note)
+        {
+            const time = elapsedTime - note.start;
+            note.length = time;
+            if (channel === DEFAULT_PERCUSSION)
+            {
+                note.length = time < minDrumLength ? minDrumLength : time;
+            }
+            // delete from unfinished
+            unfinishedNotes[channel].splice(noteIndex, 1);
+        }
+        unfinished--;
+    };
+    while (eventIndex < events.length)
+    {
+        const event = events[eventIndex];
+        
+        const status = event.messageStatusByte >> 4;
+        const channel = event.messageStatusByte & 0x0F;
+        
+        // note off
+        if (status === 0x8)
+        {
+            noteOff(event.messageData[0], channel);
+        }
+        // note on
+        else if (status === 0x9)
+        {
+            if (event.messageData[1] === 0)
+            {
+                // never mind, its note off
+                noteOff(event.messageData[0], channel);
+            }
+            else
+            {
+                // stop previous
+                noteOff(event.messageData[0], channel);
+                const noteTime = {
+                    midiNote: event.messageData[0],
+                    start: elapsedTime,
+                    length: -1,
+                    velocity: event.messageData[1] / 127
+                };
+                noteTimes[channel].push(noteTime);
+                unfinishedNotes[channel].push(noteTime);
+                unfinished++;
+                
+            }
+        }
+        // set tempo
+        else if (event.messageStatusByte === 0x51)
+        {
+            oneTickToSeconds = 60 / (getTempo(event) * this.timeDivision);
+        }
+        
+        if (++eventIndex >= events.length)
+        {
+            break;
+        }
+        
+        elapsedTime += oneTickToSeconds * (events[eventIndex].ticks - event.ticks);
+    }
+    
+    // finish the unfinished notes
+    if (unfinished > 0)
+    {
+        // for every channel, for every note that is unfinished (has -1 length)
+        unfinishedNotes.forEach((channelNotes, channel) =>
+        {
+            channelNotes.forEach(note =>
+            {
+                const time = elapsedTime - note.start;
+                note.length = time;
+                if (channel === DEFAULT_PERCUSSION)
+                {
+                    note.length = time < minDrumLength ? minDrumLength : time;
+                }
+            });
+        });
+    }
+    return noteTimes;
+}

package/{midi_parser → midi/midi_tools}/midi_editor.js

@@ -1,12 +1,12 @@
-import { messageTypes, midiControllers, MIDIMessage } from "./midi_message.js";
-import { IndexedByteArray } from "../utils/indexed_array.js";
-import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils/loggin.js";
-import { consoleColors } from "../utils/other.js";
+import { messageTypes, midiControllers, MIDIMessage } from "../midi_message.js";
+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/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";
+import { customControllers } from "../../synthetizer/audio_engine/engine_components/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";
 
 /**
  * @param ticks {number}

package/{midi_parser → midi/midi_tools}/midi_writer.js

@@ -1,6 +1,6 @@
-import { messageTypes } from "./midi_message.js";
-import { writeVariableLengthQuantity } from "../utils/byte_functions/variable_length_quantity.js";
-import { writeBytesAsUintBigEndian } from "../utils/byte_functions/big_endian.js";
+import { messageTypes } from "../midi_message.js";
+import { writeVariableLengthQuantity } from "../../utils/byte_functions/variable_length_quantity.js";
+import { writeBytesAsUintBigEndian } from "../../utils/byte_functions/big_endian.js";
 
 /**
  * Exports the midi as a standard MIDI file

package/{midi_parser → midi/midi_tools}/rmidi_writer.js

@@ -1,14 +1,14 @@
-import { combineArrays, IndexedByteArray } from "../utils/indexed_array.js";
-import { writeRIFFOddSize } from "../soundfont/basic_soundfont/riff_chunk.js";
-import { getStringBytes, getStringBytesZero } from "../utils/byte_functions/string.js";
-import { messageTypes, midiControllers, MIDIMessage } from "./midi_message.js";
+import { combineArrays, IndexedByteArray } from "../../utils/indexed_array.js";
+import { writeRIFFOddSize } from "../../soundfont/basic_soundfont/riff_chunk.js";
+import { getStringBytes, getStringBytesZero } from "../../utils/byte_functions/string.js";
+import { messageTypes, midiControllers, MIDIMessage } from "../midi_message.js";
 import { getGsOn } from "./midi_editor.js";
-import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils/loggin.js";
-import { consoleColors } from "../utils/other.js";
-import { writeLittleEndian } from "../utils/byte_functions/little_endian.js";
-import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { chooseBank, isSystemXG, parseBankSelect } from "../utils/xg_hacks.js";
-import { isGM2On, isGMOn, isGSDrumsOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
+import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../utils/loggin.js";
+import { consoleColors } from "../../utils/other.js";
+import { writeLittleEndian } from "../../utils/byte_functions/little_endian.js";
+import { DEFAULT_PERCUSSION } from "../../synthetizer/synth_constants.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../../utils/xg_hacks.js";
+import { isGM2On, isGMOn, isGSDrumsOn, isGSOn, isXGOn } from "../../utils/sysex_detector.js";
 
 /**
  * @enum {string}

package/{midi_parser → midi/midi_tools}/used_keys_loaded.js

@@ -1,15 +1,15 @@
-import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils/loggin.js";
-import { consoleColors } from "../utils/other.js";
-import { messageTypes, midiControllers } from "./midi_message.js";
-import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { chooseBank, isSystemXG, parseBankSelect } from "../utils/xg_hacks.js";
-import { isGSDrumsOn, isXGOn } from "../utils/sysex_detector.js";
+import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../utils/loggin.js";
+import { consoleColors } from "../../utils/other.js";
+import { messageTypes, midiControllers } from "../midi_message.js";
+import { DEFAULT_PERCUSSION } from "../../synthetizer/synth_constants.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../../utils/xg_hacks.js";
+import { isGSDrumsOn, isXGOn } from "../../utils/sysex_detector.js";
 
 /**
  * Gets the used programs and keys for this MIDI file with a given sound bank
  * @this {BasicMIDI}
  * @param soundfont {BasicSoundBank|WorkletSoundfontManager} - the sound bank
- * @returns {Object<string, Set<string>>}
+ * @returns {Object<string, Set<string>>} Object<bank:program, Set<key-velocity>>
  */
 export function getUsedProgramsAndKeys(soundfont)
 {

package/{midi_parser → midi}/xmf_loader.js

@@ -3,7 +3,7 @@ import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn
 import { consoleColors } from "../utils/other.js";
 import { readBytesAsUintBigEndian } from "../utils/byte_functions/big_endian.js";
 import { readVariableLengthQuantity } from "../utils/byte_functions/variable_length_quantity.js";
-import { RMIDINFOChunks } from "./rmidi_writer.js";
+import { RMIDINFOChunks } from "./midi_tools/rmidi_writer.js";
 import { inflateSync } from "../externals/fflate/fflate.min.js";
 import { IndexedByteArray } from "../utils/indexed_array.js";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.25.21",
+  "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 { messageTypes, midiControllers } from "../../midi_parser/midi_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/play.js

@@ -1,9 +1,7 @@
-import { getEvent, messageTypes, midiControllers } from "../../midi_parser/midi_message.js";
+import { getEvent, messageTypes, midiControllers } from "../../midi/midi_message.js";
 import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
-import { resetArray } from "../../synthetizer/audio_engine/worklet_utilities/controller_tables.js";
-import {
-    nonResetableCCs
-} from "../../synthetizer/audio_engine/worklet_methods/controller_control/reset_controllers.js";
+import { resetArray } from "../../synthetizer/audio_engine/engine_components/controller_tables.js";
+import { nonResetableCCs } from "../../synthetizer/audio_engine/engine_methods/controller_control/reset_controllers.js";
 
 
 // an array with preset default values

package/sequencer/sequencer_engine/process_event.js

@@ -1,4 +1,4 @@
-import { getEvent, messageTypes } from "../../midi_parser/midi_message.js";
+import { getEvent, messageTypes } from "../../midi/midi_message.js";
 import { SpessaSynthSequencerReturnMessageType } from "../worklet_wrapper/sequencer_message.js";
 import { consoleColors } from "../../utils/other.js";
 import { SpessaSynthWarn } from "../../utils/loggin.js";

package/sequencer/sequencer_engine/sequencer_engine.js

@@ -3,10 +3,9 @@ import { _addNewMidiPort, _processEvent } from "./process_event.js";
 import { _findFirstEventIndex, processTick } from "./process_tick.js";
 import { assignMIDIPort, loadNewSequence, loadNewSongList, nextSong, previousSong } from "./song_control.js";
 import { _playTo, _recalculateStartTime, play, setTimeTicks } from "./play.js";
-import { messageTypes, midiControllers } from "../../midi_parser/midi_message.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/sequencer/sequencer_engine/song_control.js

@@ -6,9 +6,9 @@ import {
     SpessaSynthInfo,
     SpessaSynthWarn
 } from "../../utils/loggin.js";
-import { MIDIData } from "../../midi_parser/midi_data.js";
-import { MIDI } from "../../midi_parser/midi_loader.js";
-import { BasicMIDI } from "../../midi_parser/basic_midi.js";
+import { MIDIData } from "../../midi/midi_data.js";
+import { MIDI } from "../../midi/midi_loader.js";
+import { BasicMIDI } from "../../midi/basic_midi.js";
 
 
 /**

package/sequencer/worklet_wrapper/sequencer.js

@@ -1,5 +1,5 @@
 import { Synthetizer } from "../../synthetizer/worklet_wrapper/synthetizer.js";
-import { messageTypes } from "../../midi_parser/midi_message.js";
+import { messageTypes } from "../../midi/midi_message.js";
 import {
     ALL_CHANNELS_OR_DIFFERENT_ACTION,
     workletMessageType
@@ -10,8 +10,8 @@ import {
     SpessaSynthSequencerReturnMessageType
 } from "./sequencer_message.js";
 import { SpessaSynthWarn } from "../../utils/loggin.js";
-import { DUMMY_MIDI_DATA, MIDIData } from "../../midi_parser/midi_data.js";
-import { BasicMIDI } from "../../midi_parser/basic_midi.js";
+import { DUMMY_MIDI_DATA, MIDIData } from "../../midi/midi_data.js";
+import { BasicMIDI } from "../../midi/basic_midi.js";
 import { readBytesAsUintBigEndian } from "../../utils/byte_functions/big_endian.js";
 import { DEFAULT_SEQUENCER_OPTIONS } from "./default_sequencer_options.js";
 

package/soundfont/basic_soundfont/modulator.js

@@ -1,5 +1,5 @@
 import { generatorTypes } from "./generator.js";
-import { midiControllers } from "../../midi_parser/midi_message.js";
+import { midiControllers } from "../../midi/midi_message.js";
 
 /**
  * modulators.js

package/soundfont/basic_soundfont/write_dls/modulator_converter.js

@@ -1,4 +1,4 @@
-import { midiControllers } from "../../../midi_parser/midi_message.js";
+import { midiControllers } from "../../../midi/midi_message.js";
 import { DLSSources } from "../../dls/dls_sources.js";
 import { modulatorCurveTypes, modulatorSources } from "../modulator.js";
 import { generatorTypes } from "../generator.js";

package/soundfont/dls/articulator_converter.js

@@ -1,6 +1,6 @@
 import { DLSSources } from "./dls_sources.js";
 import { getModSourceEnum, Modulator, modulatorCurveTypes, modulatorSources } from "../basic_soundfont/modulator.js";
-import { midiControllers } from "../../midi_parser/midi_message.js";
+import { midiControllers } from "../../midi/midi_message.js";
 import { DLSDestinations } from "./dls_destinations.js";
 
 import { generatorTypes } from "../basic_soundfont/generator.js";

package/synthetizer/audio_engine/README.md

@@ -1,9 +1,9 @@
-## This is the worklet system synthesis folder.
+## This is the synthesis engine folder.
 
 The code here is responsible for a single midi channel, synthesizing the sound to it.
 
-- `worklet_methods` contains the methods for the `main_processor.js`
-- `worklet_utilities` contains the various digital signal processing functions such as the wavetable oscillator, low
+- `engine_methods` contains the methods for the `main_processor.js`
+- `engine_components` contains the various digital signal processing functions such as the wavetable oscillator, low
   pass filter, etc.
 
 For those interested, `render_voice.js` file contains the actual DSP synthesis code.
@@ -11,9 +11,9 @@ For those interested, `render_voice.js` file contains the actual DSP synthesis c
 `minify_processor.js` uses esbuild to minify the processor code. Importing this instead of `worklet_processor.js` is
 recommended.
 
-## How it works
+## How it works in spessasynth_lib
 Both `Synthetizer` and `Sequencer` are essentially "remote control"
-for the actual sequencer and synthesizer in the audio worklet thread.
+for the actual sequencer and synthesizer in the audio worklet thread (here)
 These core components are wrapped in the AudioWorkletProcessor, which is receiving both commands and data (MIDIs, sound banks)
 through the message port, and sends data back (events, time changes, status changes, etc.).
 

package/synthetizer/audio_engine/{worklet_utilities/worklet_modulator.js → engine_components/compute_modulator.js}

@@ -1,12 +1,12 @@
 import { getModulatorCurveValue, MOD_PRECOMPUTED_LENGTH } from "./modulator_curves.js";
-import { WorkletVolumeEnvelope } from "./volume_envelope.js";
-import { WorkletModulationEnvelope } from "./modulation_envelope.js";
+import { VolumeEnvelope } from "./volume_envelope.js";
+import { ModulationEnvelope } from "./modulation_envelope.js";
 import { generatorLimits, generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { Modulator, modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
 import { NON_CC_INDEX_OFFSET } from "./controller_tables.js";
 
 /**
- * worklet_modulator.js
+ * compute_modulator.js
  * purpose: precomputes all curve types and computes modulators
  */
 
@@ -16,10 +16,10 @@ const EFFECT_MODULATOR_TRANSFORM_MULTIPLIER = 1000 / 200;
  * Computes a given modulator
  * @param controllerTable {Int16Array} all midi controllers as 14bit values + the non-controller indexes, starting at 128
  * @param modulator {Modulator} the modulator to compute
- * @param voice {WorkletVoice} the voice belonging to the modulator
+ * @param voice {Voice} the voice belonging to the modulator
  * @returns {number} the computed value
  */
-export function computeWorkletModulator(controllerTable, modulator, voice)
+export function computeModulator(controllerTable, modulator, voice)
 {
     if (modulator.transformAmount === 0)
     {
@@ -119,7 +119,7 @@ export function computeWorkletModulator(controllerTable, modulator, voice)
 
 /**
  * Computes modulators of a given voice. Source and index indicate what modulators shall be computed
- * @param voice {WorkletVoice} the voice to compute modulators for
+ * @param voice {Voice} the voice to compute modulators for
  * @param controllerTable {Int16Array} all midi controllers as 14bit values + the non-controller indexes, starting at 128
  * @param sourceUsesCC {number} what modulators should be computed, -1 means all, 0 means modulator source enum 1 means midi controller
  * @param sourceIndex {number} enum for the source
@@ -137,7 +137,7 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
         modulators.forEach(mod =>
         {
             const limits = generatorLimits[mod.modulatorDestination];
-            const newValue = modulatedGenerators[mod.modulatorDestination] + computeWorkletModulator(
+            const newValue = modulatedGenerators[mod.modulatorDestination] + computeModulator(
                 controllerTable,
                 mod,
                 voice
@@ -147,8 +147,8 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
                 Math.min(newValue, limits.max)
             );
         });
-        WorkletVolumeEnvelope.recalculate(voice);
-        WorkletModulationEnvelope.recalculate(voice);
+        VolumeEnvelope.recalculate(voice);
+        ModulationEnvelope.recalculate(voice);
         return;
     }
     
@@ -180,7 +180,7 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
                 // Reset this destination
                 modulatedGenerators[destination] = generators[destination];
                 // compute our modulator
-                computeWorkletModulator(controllerTable, mod, voice);
+                computeModulator(controllerTable, mod, voice);
                 // sum the values of all modulators for this destination
                 modulators.forEach(m =>
                 {
@@ -202,10 +202,10 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
     // Recalculate volume envelope if necessary
     if ([...computedDestinations].some(dest => volenvNeedsRecalculation.has(dest)))
     {
-        WorkletVolumeEnvelope.recalculate(voice);
+        VolumeEnvelope.recalculate(voice);
     }
     
-    WorkletModulationEnvelope.recalculate(voice);
+    ModulationEnvelope.recalculate(voice);
 }