spessasynth_core 1.0.6 → 1.0.9

package/package.json

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

package/spessasynth_core/sequencer/worklet_sequencer/play.js

@@ -77,8 +77,11 @@ export function _playTo(time, ticks = undefined)
                 break;
 
             case messageTypes.controllerChange:
+
                 // do not skip data entries
                 const controllerNumber = event.messageData[0];
+                // Keep in mind midi ports to determine channel!!
+                const channel = info.channel + (this.midiPortChannelOffsets[this.midiPorts[trackIndex]] || 0);
                 if(
                     controllerNumber === midiControllers.dataDecrement           ||
                     controllerNumber === midiControllers.dataEntryMsb            ||
@@ -93,12 +96,10 @@ export function _playTo(time, ticks = undefined)
                     controllerNumber === midiControllers.resetAllControllers
                 )
                 {
-                    this.synth.controllerChange(info.channel, controllerNumber, event.messageData[1]);
+                    this.synth.controllerChange(channel, controllerNumber, event.messageData[1]);
                 }
                 else
                 {
-                    // Keep in mind midi ports to determine channel!!
-                    const channel = info.channel + (this.midiPortChannelOffsets[this.midiPorts[trackIndex]] || 0);
                     if(savedControllers[channel] === undefined)
                     {
                         savedControllers[channel] = Array.from(defaultControllerArray);
@@ -106,19 +107,6 @@ export function _playTo(time, ticks = undefined)
                     savedControllers[channel][controllerNumber] = event.messageData[1];
                 }
                 break;
-
-            // midiport: handle it and make sure that the saved controllers table is the same size as synth channels
-            case messageTypes.midiPort:
-                this._processEvent(event, trackIndex);
-                if(this.synth.workletProcessorChannels.length > savedControllers.length)
-                {
-                    while(this.synth.workletProcessorChannels.length > savedControllers.length)
-                    {
-                        savedControllers.push(Array.from(defaultControllerArray));
-                    }
-                }
-                break;
-
             default:
                 this._processEvent(event, trackIndex);
                 break;

package/spessasynth_core/sequencer/worklet_sequencer/process_event.js

@@ -14,7 +14,8 @@ export function _processEvent(event, trackIndex)
 {
     if(this.ignoreEvents) return;
     const statusByteData = getEvent(event.messageStatusByte);
-    statusByteData.channel += this.midiPortChannelOffsets[this.midiPorts[trackIndex]] || 0;
+    const offset = this.midiPortChannelOffsets[this.midiPorts[trackIndex]] || 0;
+    statusByteData.channel += offset;
     // process the event
     switch (statusByteData.status) {
         case messageTypes.noteOn:
@@ -50,27 +51,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:
@@ -100,7 +82,7 @@ export function _processEvent(event, trackIndex)
             break;
 
         case messageTypes.systemExclusive:
-            this.synth.systemExclusive(event.messageData);
+            this.synth.systemExclusive(event.messageData, offset);
             break;
 
         case messageTypes.reset:

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 + 15) {
+                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/system_exclusive.js

@@ -3,10 +3,11 @@ import { SpessaSynthInfo, SpessaSynthWarn } from '../../../utils/loggin.js'
 /**
  * Executes a system exclusive
  * @param messageData {number[]} - the message data without f0
+ * @param channelOffset {number}
  * @this {Synthesizer}
  */
 
-export function systemExclusive(messageData)
+export function systemExclusive(messageData, channelOffset = 0)
 {
     const type = messageData[0];
     switch (type)
@@ -117,7 +118,7 @@ export function systemExclusive(messageData)
                     {
                         // this is an individual part (channel) parameter
                         // determine the channel 0 means channel 10 (default), 1 means 1 etc.
-                        const channel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][messageData[5] & 0x0F]; // for example 1A means A = 11, which corresponds to channel 12 (counting from 1)
+                        const channel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][messageData[5] & 0x0F] + channelOffset; // for example 1A means A = 11, which corresponds to channel 12 (counting from 1)
                         switch (messageData[6])
                         {
                             default: