spessasynth_lib 3.26.5 → 3.26.7

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,85 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <option name="DO_NOT_FORMAT">
+      <list>
+        <fileSet type="globPattern" pattern="*.md" />
+      </list>
+    </option>
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+      <option name="HTML_QUOTE_STYLE" value="Single" />
+      <option name="HTML_ENFORCE_QUOTES" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="ALWAYS_JS" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+      <option name="FUNCTION_EXPRESSION_BRACE_STYLE" value="2" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="120" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="RIGHT_MARGIN" value="120" />
+      <option name="BRACE_STYLE" value="2" />
+      <option name="CLASS_BRACE_STYLE" value="2" />
+      <option name="METHOD_BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <option name="SOFT_MARGINS" value="120" />
+      <indentOptions>
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Markdown">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="120" />
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="120" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/spessasynth_lib.iml" filepath="$PROJECT_DIR$/.idea/spessasynth_lib.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/spessasynth_lib.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/spessasynth_lib.wiki" vcs="Git" />
+  </component>
+</project>

package/index.js

@@ -1,12 +1,12 @@
 // Import modules
 
-import { Synthetizer } from "./synthetizer/synthetizer.js";
-import { Sequencer } from "./sequencer/sequencer.js";
-import { audioBufferToWav } from "./utils/buffer_to_wav.js";
-import { MIDIDeviceHandler } from "./external_midi/midi_handler.js";
-import { WebMIDILinkHandler } from "./external_midi/web_midi_link.js";
-import { DEFAULT_SYNTH_CONFIG } from "./synthetizer/audio_effects/effects_config.js";
-import { WORKLET_URL_ABSOLUTE } from "./synthetizer/worklet_url.js";
+import { Synthetizer } from "./src/synthetizer/synthetizer.js";
+import { Sequencer } from "./src/sequencer/sequencer.js";
+import { audioBufferToWav } from "./src/utils/buffer_to_wav.js";
+import { MIDIDeviceHandler } from "./src/external_midi/midi_handler.js";
+import { WebMIDILinkHandler } from "./src/external_midi/web_midi_link.js";
+import { DEFAULT_SYNTH_CONFIG } from "./src/synthetizer/audio_effects/effects_config.js";
+import { WORKLET_URL_ABSOLUTE } from "./src/synthetizer/worklet_url.js";
 
 // Export modules
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.26.5",
+  "version": "3.26.7",
   "description": "MIDI and SoundFont2/DLS library for the browsers with no compromises",
   "browser": "index.js",
   "type": "module",
@@ -41,15 +41,6 @@
     "email": "spesekspesek@gmail.com"
   },
   "homepage": "https://github.com/spessasus/spessasynth_lib#readme",
-  "files": [
-    "index.js",
-    "LICENSE",
-    "README.md",
-    "sequencer",
-    "synthetizer",
-    "utils",
-    "external_midi"
-  ],
   "dependencies": {
     "spessasynth_core": "latest"
   }

package/{sequencer → src/sequencer}/README.md

@@ -1,8 +1,6 @@
 ## This is the sequencer's folder.
 
-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
+The code here is responsible for wrapping the `SpessaSynthSequencer` from `spessasynth_core`.
 
 ### Message protocol:
 
@@ -29,4 +27,4 @@ The `messageData` is set to the sequencer's return message.
 
 ### Process tick
 
-`processTick` is called every time the `process` method is called via `SpessaSynthProcessor.processTickCallback`.
+`processTick` is called every time the `process` method is called via `sequencer.processTick()` every rendering quantum.

package/{synthetizer → src/synthetizer}/README.md

@@ -1,19 +1,11 @@
 ## This is the main synthesizer folder.
 
-The code here is responsible for making the actual sound.
-This is the heart of the SpessaSynth library.
-
-- `audio_engine` - the core synthesis engine, it theoretically can run on non-browser environments.
-- `audio_effects` - the WebAudioAPI audio effects.
-- `worklet_wrapper` - the wrapper for the core synthesis engine using audio worklets.
-
-`worklet_processor.min.js` - the minified worklet processor code to import.
-
+The code here is responsible for wrapping `SpessaSynthProcessor` from `spessasynth_core`.
 # About the message protocol
 Since spessasynth_lib runs in the audioWorklet thread, here is an explanation of how it works:
 
 There's one processor per synthesizer, with a `MessagePort` for communication.
-Each processor has a single `SpessaSynthequencer` instance that is idle by default.
+Each processor has a single `SpessaSynthSequencer` instance that is idle by default.
 
 The `Synthetizer`, 
 `Sequencer` and `SoundFontManager` classes are all interfaces 

package/{synthetizer → src/synthetizer}/worklet_processor.js

@@ -2,6 +2,7 @@ import { consoleColors } from "../utils/other.js";
 import {
     ALL_CHANNELS_OR_DIFFERENT_ACTION,
     BasicMIDI,
+    loadSoundFont,
     masterParameterType,
     MIDI,
     MIDI_CHANNEL_COUNT,
@@ -88,105 +89,107 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
          * @type {SpessaSynthProcessor}
          */
         this.synthesizer = new SpessaSynthProcessor(
-            opts.soundfont,                          // initial sound bank
-            sampleRate,                              // AudioWorkletGlobalScope
+            sampleRate, // AudioWorkletGlobalScope
             {
-                eventCall: (t, d) =>
-                {
-                    postSyn(returnMessageType.eventCall, {
-                        eventName: t,
-                        eventData: d
-                    });
-                },
-                ready: this.postReady.bind(this),
-                channelPropertyChange: (p, n) => postSyn(returnMessageType.channelPropertyChange, [n, p]),
-                masterParameterChange: (t, v) => postSyn(returnMessageType.masterParameterChange, [t, v])
-            },
-            !this.oneOutputMode,                     // one output mode disables effects
-            opts?.enableEventSystem,                 // enable message port?
-            currentTime,                             // AudioWorkletGlobalScope, sync with audioContext time
-            MIDI_CHANNEL_COUNT,                      // midi channel count (16)
-            snapshot
+                effectsEnabled: !this.oneOutputMode,         // one output mode disables effects
+                enableEventSystem: opts?.enableEventSystem,  // enable message port?
+                midiChannels: MIDI_CHANNEL_COUNT,            // midi channel count (16)
+                initialTime: currentTime                     // AudioWorkletGlobalScope, sync with audioContext time
+            }
         );
-        
-        // initialize the sequencer engine
-        this.sequencer = new SpessaSynthSequencer(this.synthesizer);
-        
-        const postSeq = (type, data) =>
+        this.synthesizer.onEventCall = (t, d) =>
         {
-            this.postMessageToMainThread({
-                messageType: returnMessageType.sequencerSpecific,
-                messageData: {
-                    messageType: type,
-                    messageData: data
-                }
+            postSyn(returnMessageType.eventCall, {
+                eventName: t,
+                eventData: d
             });
         };
+        this.synthesizer.onChannelPropertyChange = (p, n) => postSyn(returnMessageType.channelPropertyChange, [n, p]);
+        this.synthesizer.onMasterParameterChange = (t, v) => postSyn(returnMessageType.masterParameterChange, [t, v]);
         
-        // receive messages from the main thread
-        this.port.onmessage = e => this.handleMessage(e.data);
+        const bank = loadSoundFont(opts.soundfont);
+        this.synthesizer.soundfontManager.reloadManager(bank);
         
-        // sequencer events
-        this.sequencer.onMIDIMessage = m =>
-        {
-            postSeq(SpessaSynthSequencerReturnMessageType.midiEvent, m);
-        };
-        this.sequencer.onTimeChange = t =>
-        {
-            postSeq(SpessaSynthSequencerReturnMessageType.timeChange, t);
-        };
-        this.sequencer.onPlaybackStop = p =>
-        {
-            postSeq(SpessaSynthSequencerReturnMessageType.pause, p);
-        };
-        this.sequencer.onSongChange = (i, a) =>
-        {
-            postSeq(SpessaSynthSequencerReturnMessageType.songChange, [i, a]);
-        };
-        this.sequencer.onMetaEvent = (e, i) =>
-        {
-            postSeq(SpessaSynthSequencerReturnMessageType.metaEvent, [e, i]);
-        };
-        this.sequencer.onLoopCountChange = c =>
-        {
-            postSeq(SpessaSynthSequencerReturnMessageType.loopCountChange, c);
-        };
-        this.sequencer.onSongListChange = l =>
-        {
-            const midiDataList = l.map(s => new MIDIData(s));
-            this.postMessageToMainThread({
-                messageType: returnMessageType.sequencerSpecific,
-                messageData: {
-                    messageType: SpessaSynthSequencerReturnMessageType.songListChange,
-                    messageData: midiDataList
-                }
-            });
-        };
-        
-        // if sent, start rendering
-        if (startRenderingData)
+        this.synthesizer.processorInitialized.then(() =>
         {
+            // initialize the sequencer engine
+            this.sequencer = new SpessaSynthSequencer(this.synthesizer);
+            
+            const postSeq = (type, data) =>
+            {
+                this.postMessageToMainThread({
+                    messageType: returnMessageType.sequencerSpecific,
+                    messageData: {
+                        messageType: type,
+                        messageData: data
+                    }
+                });
+            };
+            
+            // receive messages from the main thread
+            this.port.onmessage = e => this.handleMessage(e.data);
+            
+            // sequencer events
+            this.sequencer.onMIDIMessage = m =>
+            {
+                postSeq(SpessaSynthSequencerReturnMessageType.midiEvent, m);
+            };
+            this.sequencer.onTimeChange = t =>
+            {
+                postSeq(SpessaSynthSequencerReturnMessageType.timeChange, t);
+            };
+            this.sequencer.onPlaybackStop = p =>
+            {
+                postSeq(SpessaSynthSequencerReturnMessageType.pause, p);
+            };
+            this.sequencer.onSongChange = (i, a) =>
+            {
+                postSeq(SpessaSynthSequencerReturnMessageType.songChange, [i, a]);
+            };
+            this.sequencer.onMetaEvent = (e, i) =>
+            {
+                postSeq(SpessaSynthSequencerReturnMessageType.metaEvent, [e, i]);
+            };
+            this.sequencer.onLoopCountChange = c =>
+            {
+                postSeq(SpessaSynthSequencerReturnMessageType.loopCountChange, c);
+            };
+            this.sequencer.onSongListChange = l =>
+            {
+                const midiDataList = l.map(s => new MIDIData(s));
+                this.postMessageToMainThread({
+                    messageType: returnMessageType.sequencerSpecific,
+                    messageData: {
+                        messageType: SpessaSynthSequencerReturnMessageType.songListChange,
+                        messageData: midiDataList
+                    }
+                });
+            };
+            
             if (snapshot !== undefined)
             {
                 this.synthesizer.applySynthesizerSnapshot(snapshot);
             }
             
-            util.SpessaSynthInfo("%cRendering enabled! Starting render.", consoleColors.info);
-            if (startRenderingData.parsedMIDI)
+            // if sent, start rendering
+            if (startRenderingData)
             {
-                if (startRenderingData?.loopCount !== undefined)
-                {
-                    this.sequencer.loopCount = startRenderingData?.loopCount;
-                    this.sequencer.loop = true;
-                }
-                else
-                {
-                    this.sequencer.loop = false;
-                }
-                // set voice cap to unlimited
-                this.synthesizer.voiceCap = Infinity;
-                this.synthesizer.processorInitialized.then(() =>
+                
+                util.SpessaSynthInfo("%cRendering enabled! Starting render.", consoleColors.info);
+                if (startRenderingData.parsedMIDI)
                 {
+                    if (startRenderingData?.loopCount !== undefined)
+                    {
+                        this.sequencer.loopCount = startRenderingData?.loopCount;
+                        this.sequencer.loop = true;
+                    }
+                    else
+                    {
+                        this.sequencer.loop = false;
+                    }
+                    // set voice cap to unlimited
+                    this.synthesizer.voiceCap = Infinity;
+                    
                     /**
                      * set options
                      * @type {SequencerOptions}
@@ -207,9 +210,11 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                         console.error(e);
                         postSeq(SpessaSynthSequencerReturnMessageType.midiError, e);
                     }
-                });
+                }
             }
-        }
+            
+            this.postReady();
+        });
     }
     
     postReady()
@@ -316,7 +321,7 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                 break;
             
             case workletMessageType.addNewChannel:
-                this.synthesizer.createWorkletChannel(true);
+                this.synthesizer.createMidiChannel(true);
                 break;
             
             case workletMessageType.debugMessage:
@@ -493,10 +498,12 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                     const sfManager = this.synthesizer.soundfontManager;
                     const type = data[0];
                     const messageData = data[1];
+                    let font;
                     switch (type)
                     {
                         case WorkletSoundfontManagerMessageType.addNewSoundFont:
-                            sfManager.addNewSoundFont(messageData[0], messageData[1], messageData[2]);
+                            font = loadSoundFont(messageData[0]);
+                            sfManager.addNewSoundFont(font, messageData[1], messageData[2]);
                             this.postMessageToMainThread({
                                 messageType: returnMessageType.isFullyInitialized,
                                 messageData: undefined
@@ -504,7 +511,8 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                             break;
                         
                         case WorkletSoundfontManagerMessageType.reloadSoundFont:
-                            sfManager.reloadManager(messageData);
+                            font = loadSoundFont(messageData);
+                            sfManager.reloadManager(font);
                             this.postMessageToMainThread({
                                 messageType: returnMessageType.isFullyInitialized,
                                 messageData: undefined
@@ -526,7 +534,6 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                         messageData: e
                     });
                 }
-                this.synthesizer.clearSoundFont(true, false);
                 break;
             
             case workletMessageType.keyModifierManager: