spessasynth_core 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "SoundFont2 synthesizer library for node.js",
   "main": "index.js",
   "type": "module",

package/spessasynth_core/sequencer/worklet_sequencer/process_event.js

@@ -50,27 +50,8 @@ export function _processEvent(event, trackIndex)
             }
             break;
 
+        // recognized but ignored
         case messageTypes.midiPort:
-            const port = event.messageData[0];
-            // assign new 16 channels if the port is not occupied yet
-            if(this.midiPortChannelOffset === 0)
-            {
-                this.midiPortChannelOffset += 16;
-                this.midiPortChannelOffsets[port] = 0;
-            }
-
-            if(this.midiPortChannelOffsets[port] === undefined)
-            {
-                if(this.synth.workletProcessorChannels.length < this.midiPortChannelOffset + 16) {
-                    this._addNewMidiPort();
-                }
-                this.midiPortChannelOffsets[port] = this.midiPortChannelOffset;
-                this.midiPortChannelOffset += 16;
-            }
-
-            this.midiPorts[trackIndex] = port;
-            break;
-
         case messageTypes.endOfTrack:
         case messageTypes.midiChannelPrefix:
         case messageTypes.timeSignature:

package/spessasynth_core/sequencer/worklet_sequencer/song_control.js

@@ -33,17 +33,39 @@ export function loadNewSequence(parsedMidi)
      */
     this.tracks = this.midiData.tracks;
 
-    // copy over the port data (can be overwritten in real time if needed)
+    // clear last port data
+    this.midiPortChannelOffset = 0;
+    this.midiPortChannelOffsets = {};
+    // copy over the port data
     this.midiPorts = this.midiData.midiPorts;
 
+    // assign port offsets
+    this.midiData.midiPorts.forEach((port, trackIndex) => {
+        // assign new 16 channels if the port is not occupied yet
+        if(this.midiPortChannelOffset === 0)
+        {
+            this.midiPortChannelOffset += 16;
+            this.midiPortChannelOffsets[port] = 0;
+        }
+
+        if(this.midiPortChannelOffsets[port] === undefined)
+        {
+            if(this.synth.workletProcessorChannels.length < this.midiPortChannelOffset + 16) {
+                this._addNewMidiPort();
+            }
+            this.midiPortChannelOffsets[port] = this.midiPortChannelOffset;
+            this.midiPortChannelOffset += 16;
+        }
+
+        this.midiPorts[trackIndex] = port;
+    });
+
     /**
      * Same as Audio.duration (seconds)
      * @type {number}
      */
     this.duration = this.midiData.duration;
     SpessaSynthInfo(`%cTotal song time: ${formatTime(Math.ceil(this.duration)).time}`, consoleColors.recognized);
-    this.midiPortChannelOffset = 0;
-    this.midiPortChannelOffsets = {};
 
     this.synth.resetAllControllers();
     if(this.duration <= 1)

package/spessasynth_core/synthetizer/worklet_system/worklet_methods/note_on.js

@@ -64,12 +64,12 @@ export function noteOn(channel, midiNote, velocity, enableDebugging = false)
         computeModulators(voice, this.workletProcessorChannels[channel].midiControllers);
         voice.currentAttenuationDb = 100;
     })
-    channelVoices.push(...voices);
 
     this.totalVoicesAmount += voices.length;
     // cap the voices
     if(this.totalVoicesAmount > VOICE_CAP)
     {
-        this.voiceKilling(this.totalVoicesAmount - VOICE_CAP);
+        this.voiceKilling(voices.length);
     }
+    channelVoices.push(...voices);
 }

package/spessasynth_core/synthetizer/worklet_system/worklet_methods/voice_control.js

@@ -143,6 +143,35 @@ export function renderVoice(channel, voice, output, reverbOutput, chorusOutput)
         chorusOutput, voice.modulatedGenerators[generatorTypes.chorusEffectsSend]);
 }
 
+/**
+ * @param channel {WorkletProcessorChannel}
+ * @param voice {WorkletVoice}
+ * @return {number}
+ */
+function getPriority(channel, voice)
+{
+    let priority = 0;
+    if(channel.drumChannel)
+    {
+        // important
+        priority += 5;
+    }
+    if(voice.isInRelease)
+    {
+        // not important
+        priority -= 5;
+    }
+    // less velocity = less important
+    priority += voice.velocity / 25; // map to 0-5
+    // the newer, more important
+    priority -= voice.volumeEnvelopeState;
+    if(voice.isInRelease)
+    {
+        priority -= 5;
+    }
+    priority -= voice.currentAttenuationDb / 50;
+    return priority;
+}
 
 /**
  * @this {Synthesizer}
@@ -150,23 +179,30 @@ export function renderVoice(channel, voice, output, reverbOutput, chorusOutput)
  */
 export function voiceKilling(amount)
 {
-    // kill the smallest velocity voices
-    let voicesOrderedByVelocity = this.workletProcessorChannels.map(channel => channel.voices);
-
-    /**
-     * @type {WorkletVoice[]}
-     */
-    voicesOrderedByVelocity = voicesOrderedByVelocity.flat();
-    voicesOrderedByVelocity.sort((v1, v2) => v1.velocity - v2.velocity);
-    if(voicesOrderedByVelocity.length < amount)
+    let allVoices = [];
+    for (const channel of this.workletProcessorChannels)
     {
-        amount = voicesOrderedByVelocity.length;
+        for (const voice of channel.voices)
+        {
+            if (!voice.finished)
+            {
+                const priority = getPriority(channel, voice);
+                allVoices.push({ channel, voice, priority });
+            }
+        }
     }
-    for (let i = 0; i < amount; i++) {
-        const voice = voicesOrderedByVelocity[i];
-        this.workletProcessorChannels[voice.channelNumber].voices
-            .splice(this.workletProcessorChannels[voice.channelNumber].voices.indexOf(voice), 1);
-        this.totalVoicesAmount--;
+
+    // Step 2: Sort voices by priority (ascending order)
+    allVoices.sort((a, b) => a.priority - b.priority);
+    const voicesToRemove = allVoices.slice(0, amount);
+
+    for (const { channel, voice } of voicesToRemove)
+    {
+        const index = channel.voices.indexOf(voice);
+        if (index > -1)
+        {
+            channel.voices.splice(index, 1);
+        }
     }
 }