@grame/faustwasm 0.5.2 → 0.5.4

package/assets/standalone/index-pwa.js

@@ -29,50 +29,23 @@ const audioContext = new AudioCtx({ latencyHint: 0.00001 });
 audioContext.destination.channelInterpretation = "discrete";
 audioContext.suspend();
 
-/**
- * @param {FaustAudioWorkletNode} faustNode 
- */
-const createFaustUI = async (faustNode) => {
-    const { FaustUI } = await import("./faust-ui/index.js");
-    const $container = document.createElement("div");
-    $container.style.margin = "0";
-    $container.style.position = "absolute";
-    $container.style.overflow = "auto";
-    $container.style.display = "flex";
-    $container.style.flexDirection = "column";
-    $container.style.width = "100%";
-    $container.style.height = "100%";
-    $divFaustUI.appendChild($container);
-    const faustUI = new FaustUI({
-        ui: faustNode.getUI(),
-        root: $container,
-        listenWindowMessage: false,
-        listenWindowResize: true,
-    });
-    faustUI.paramChangeByUI = (path, value) => faustNode.setParamValue(path, value);
-    faustNode.setOutputParamHandler((path, value) => faustUI.paramChangeByDSP(path, value));
-    $container.style.minWidth = `${faustUI.minWidth}px`;
-    $container.style.minHeight = `${faustUI.minHeight}px`;
-    faustUI.resize();
-};
-
 (async () => {
 
-    const { createFaustNode } = await import("./create-node.js");
-
     // To test the ScriptProcessorNode mode
     // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES, true);
+    const { createFaustNode } = await import("./create-node.js");
     const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES);
     if (!faustNode) throw new Error("Faust DSP not compiled");
 
     // Create the Faust UI
-    await createFaustUI(faustNode);
+    const { createFaustUI } = await import("./create-node.js");
+    await createFaustUI($divFaustUI, faustNode);
 
     // Connect the Faust node to the audio output
     faustNode.connect(audioContext.destination);
 
     // Connect the Faust node to the audio input
-    if (faustNode.getNumInputs() > 0) {
+    if (faustNode.numberOfInputs > 0) {
         const { connectToAudioInput } = await import("./create-node.js");
         await connectToAudioInput(audioContext, null, faustNode, null);
     }
@@ -81,40 +54,27 @@ const createFaustUI = async (faustNode) => {
     await faustNode.listenSensors();
 
     // Function to initialize MIDI
-    function initMIDI() {
+    function initMIDI(faustNode) {
         // Check if the browser supports the Web MIDI API
         if (navigator.requestMIDIAccess) {
-            navigator.requestMIDIAccess()
-                .then(onMIDISuccess, onMIDIFailure);
+            navigator.requestMIDIAccess().then(
+                midiAccess => {
+                    console.log("MIDI Access obtained.");
+                    for (let input of midiAccess.inputs.values()) {
+                        input.onmidimessage = (event) => faustNode.midiMessage(event.data);
+                        console.log(`Connected to input: ${input.name}`);
+                    }
+                },
+                () => console.error("Failed to access MIDI devices.")
+            );
         } else {
             console.log("Web MIDI API is not supported in this browser.");
         }
     }
 
-    // Success callback for requesting MIDI access
-    function onMIDISuccess(midiAccess) {
-        console.log("MIDI Access obtained.");
-        // Iterate through all available MIDI inputs
-        for (let input of midiAccess.inputs.values()) {
-            // Attach the event listener to each input
-            input.onmidimessage = handleMIDIMessage;
-            console.log(`Connected to input: ${input.name}`);
-        }
-    }
-
-    // Failure callback for requesting MIDI access
-    function onMIDIFailure() {
-        console.error("Failed to access MIDI devices.");
-    }
-
-    // Dummy event handler for MIDI messages
-    function handleMIDIMessage(event) {
-        faustNode.midiMessage(event.data);
-    }
-
     // Initialize the MIDI setup
     if (FAUST_DSP_VOICES > 0) {
-        initMIDI();
+        initMIDI(faustNode);
     }
 
 })();

package/assets/standalone/index.js

@@ -38,6 +38,7 @@ const AudioCtx = window.AudioContext || window.webkitAudioContext;
 const audioContext = new AudioCtx({ latencyHint: 0.00001 });
 audioContext.destination.channelInterpretation = "discrete";
 audioContext.suspend();
+
 $buttonDsp.disabled = true;
 
 /**
@@ -106,49 +107,35 @@ const buildMidiDeviceMenu = async (faustNode) => {
     };
 };
 
-/**
- * @param {FaustAudioWorkletNode} faustNode 
- */
-const createFaustUI = async (faustNode) => {
-    const { FaustUI } = await import("./faust-ui/index.js");
-    const $container = document.createElement("div");
-    $container.style.margin = "0";
-    $container.style.position = "absolute";
-    $container.style.overflow = "auto";
-    $container.style.display = "flex";
-    $container.style.flexDirection = "column";
-    $container.style.width = "100%";
-    $container.style.height = "100%";
-    $divFaustUI.appendChild($container);
-    const faustUI = new FaustUI({
-        ui: faustNode.getUI(),
-        root: $container,
-        listenWindowMessage: false,
-        listenWindowResize: true,
-    });
-    faustUI.paramChangeByUI = (path, value) => faustNode.setParamValue(path, value);
-    faustNode.setOutputParamHandler((path, value) => faustUI.paramChangeByDSP(path, value));
-    $container.style.minWidth = `${faustUI.minWidth}px`;
-    $container.style.minHeight = `${faustUI.minHeight}px`;
-    faustUI.resize();
-};
-
 (async () => {
-    const { createFaustNode } = await import("./create-node.js");
+
     // To test the ScriptProcessorNode mode
     // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES, true);
+    const { createFaustNode } = await import("./create-node.js");
     const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
     if (!faustNode) throw new Error("Faust DSP not compiled");
-    await createFaustUI(faustNode);
+
+    // Create the Faust UI
+    const { createFaustUI } = await import("./create-node.js");
+    await createFaustUI($divFaustUI, faustNode);
+
+    // Connect the Faust node to the audio output
     faustNode.connect(audioContext.destination);
-    if (faustNode.numberOfInputs) await buildAudioDeviceMenu(faustNode);
+
+    // Build the audio device menu
+    if (faustNode.numberOfInputs > 0) await buildAudioDeviceMenu(faustNode);
     else $spanAudioInput.hidden = true;
+
+    // Build the MIDI device menu
     if (navigator.requestMIDIAccess) await buildMidiDeviceMenu(faustNode);
     else $spanMidiInput.hidden = true;
+
+    // Set the title and enable the DSP button
     $buttonDsp.disabled = false;
     document.title = name;
     let motionHandlersBound = false;
     $buttonDsp.onclick = async () => {
+        // Activate sensor listeners
         if (!motionHandlersBound) {
             await faustNode.listenSensors();
             motionHandlersBound = true;