@grame/faustwasm 0.5.0 → 0.5.2

package/assets/standalone/create-node.js

@@ -75,4 +75,31 @@ const createFaustNode = async (audioContext, dspName = "template", voices = 0, s
     return { faustNode, dspMeta };
 }
 
-export default createFaustNode;
+/**
+ * Connects an audio input stream to a Faust audio node.
+ * 
+ * @param {AudioContext} audioContext - The Web Audio API AudioContext to which the Faust audio node is connected.
+ * @param {string} id - The ID of the audio input device to connect.
+ * @param {FaustNode} faustNode - The Faust audio node to which the audio input stream will be connected.
+ * @param {MediaStreamAudioSourceNode} inputStreamNode - The audio input stream node to be connected to the Faust audio node.
+ * @returns {Promise<MediaStreamAudioSourceNode>} - The audio input stream node connected to the Faust audio node.
+ */
+async function connectToAudioInput(audioContext, id, faustNode, inputStreamNode) {
+    const constraints = {
+        audio: {
+            echoCancellation: false,
+            noiseSuppression: false,
+            autoGainControl: false,
+            deviceId: id ? { exact: id } : undefined,
+        },
+    };
+    const stream = await navigator.mediaDevices.getUserMedia(constraints);
+    if (stream) {
+        if (inputStreamNode) inputStreamNode.disconnect();
+        inputStreamNode = audioContext.createMediaStreamSource(stream);
+        inputStreamNode.connect(faustNode);
+    }
+    return inputStreamNode;
+};
+
+export { createFaustNode, connectToAudioInput };

package/assets/standalone/index-pwa.js

@@ -58,7 +58,7 @@ const createFaustUI = async (faustNode) => {
 
 (async () => {
 
-    const { default: createFaustNode } = await import("./create-node.js");
+    const { createFaustNode } = await import("./create-node.js");
 
     // To test the ScriptProcessorNode mode
     // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES, true);
@@ -68,9 +68,15 @@ const createFaustUI = async (faustNode) => {
     // Create the Faust UI
     await createFaustUI(faustNode);
 
-    // Connect the Faust node to the audio context
+    // Connect the Faust node to the audio output
     faustNode.connect(audioContext.destination);
 
+    // Connect the Faust node to the audio input
+    if (faustNode.getNumInputs() > 0) {
+        const { connectToAudioInput } = await import("./create-node.js");
+        await connectToAudioInput(audioContext, null, faustNode, null);
+    }
+
     // Activate sensor listeners
     await faustNode.listenSensors();
 

package/assets/standalone/index-template.js

@@ -2,7 +2,7 @@
 const FAUST_DSP_VOICES = 0;
 
 (async () => {
-    const { default: createFaustNode } = await import("./create-node.js");
+    const { createFaustNode } = await import("./create-node.js");
 
     // Create audio context
     const AudioCtx = window.AudioContext || window.webkitAudioContext;
@@ -37,12 +37,18 @@ const FAUST_DSP_VOICES = 0;
     const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
     if (!faustNode) throw new Error("Faust DSP not compiled");
 
-    // Connect Faust node to audio context
+    // Connect the Faust node to the audio output
     faustNode.connect(audioContext.destination);
 
+    // Connect the Faust node to the audio input
+    if (faustNode.getNumInputs() > 0) {
+        const { connectToAudioInput } = await import("./create-node.js");
+        await connectToAudioInput(audioContext, null, faustNode, null);
+    }
+
     // Create Faust node activation button
     $buttonDsp.disabled = false;
-    
+
     // Set page title to the DSP name
     document.title = name;
 })();

package/assets/standalone/index.js

@@ -44,8 +44,10 @@ $buttonDsp.disabled = true;
  * @param {FaustAudioWorkletNode} faustNode 
  */
 const buildAudioDeviceMenu = async (faustNode) => {
-    /** @type {MediaStreamAudioSourceNode} */
-    let inputStreamNode;
+
+    const { connectToAudioInput } = await import("./create-node.js");
+
+    let inputStreamNode = null;
     const handleDeviceChange = async () => {
         const devicesInfo = await navigator.mediaDevices.enumerateDevices();
         $selectAudioInput.innerHTML = "";
@@ -61,31 +63,14 @@ const buildAudioDeviceMenu = async (faustNode) => {
     navigator.mediaDevices.addEventListener("devicechange", handleDeviceChange)
     $selectAudioInput.onchange = async () => {
         const id = $selectAudioInput.value;
-        const constraints = {
-            audio: {
-                echoCancellation: false,
-                noiseSuppression: false,
-                autoGainControl: false,
-                deviceId: id ? { exact: id } : undefined,
-            },
-        };
-        const stream = await navigator.mediaDevices.getUserMedia(constraints);
-        if (inputStreamNode) inputStreamNode.disconnect();
-        inputStreamNode = audioContext.createMediaStreamSource(stream);
-        inputStreamNode.connect(faustNode);
-    };
-
-    const defaultConstraints = {
-        audio: {
-            echoCancellation: false,
-            mozNoiseSuppression: false,
-            mozAutoGainControl: false
+        if (faustNode.getNumInputs() > 0) {
+            inputStreamNode = await connectToAudioInput(audioContext, id, faustNode, inputStreamNode);
         }
     };
-    const defaultStream = await navigator.mediaDevices.getUserMedia(defaultConstraints);
-    if (defaultStream) {
-        inputStreamNode = audioContext.createMediaStreamSource(defaultStream);
-        inputStreamNode.connect(faustNode);
+
+    // Connect to the default audio input device
+    if (faustNode.getNumInputs() > 0) {
+        inputStreamNode = await connectToAudioInput(audioContext, null, faustNode, inputStreamNode);
     }
 };
 
@@ -149,7 +134,7 @@ const createFaustUI = async (faustNode) => {
 };
 
 (async () => {
-    const { default: createFaustNode } = await import("./create-node.js");
+    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 { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",

package/scripts/faust2sndfile.js

@@ -40,5 +40,4 @@ if ($sr !== -1) sampleRate = +argv.splice($sr, 2)[1];
 
 const [inputFile, outputWav, ...argvFaust] = argv;
 
-
 faust2wavFiles(inputFile, inputWav, outputWav, bufferSize, sampleRate, samples, bitDepth, argvFaust);

package/src/faust2svgFiles.js

@@ -26,7 +26,6 @@ const faust2svgFiles = async (inputFile, outputDir, argv = []) => {
     const code = fs.readFileSync(inputFile, { encoding: "utf8" });
     const { name } = path.parse(inputFile);
     const diagram = new FaustSvgDiagrams(compiler);
-    if (!argv.find(a => a === "-I")) argv.push("-I", "libraries/");
     const svgs = diagram.from(name, code, argv.join(" "));
     console.log(`Generated ${Object.keys(svgs).length} files.`);
     console.log(`Writing files to ${outputDir}`);

package/src/faust2wasmFiles.js

@@ -31,8 +31,7 @@ const faust2wasmFiles = async (inputFile, outputDir, argv = [], poly = false) =>
 
     const fileName = /** @type {string} */(inputFile.split('/').pop());
     const dspName = fileName.replace(/\.dsp$/, '');
-
-    if (!argv.find(a => a === "-I")) argv.push("-I", "libraries/");
+    // Flush to zero to avoid costly denormalized numbers
     argv.push("-ftz", "2");
     const dspModulePath = path.join(outputDir, `dsp-module.wasm`);
     const dspMetaPath = path.join(outputDir, `dsp-meta.json`);

package/src/faust2wavFiles.js

@@ -32,7 +32,6 @@ const faust2wavFiles = async (inputFile, inputWav, outputWav, bufferSize = 64, s
     console.log(`Faust Compiler version: ${compiler.version()}`);
     console.log(`Reading file ${inputFile}`);
     const code = fs.readFileSync(inputFile, { encoding: "utf8" });
-    if (!argv.find(a => a === "-I")) argv.push("-I", "libraries/");
     const { name } = path.parse(inputFile);
     const gen = new FaustMonoDspGenerator();
     await gen.compile(compiler, name, code, argv.join(" "));

package/build

@@ -1,25 +0,0 @@
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/atomicro/atomicro.dsp /Users/letz/Developpements/sletz.github.io/atomicro -pwa 
-
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/attackey/attackey.dsp /Users/letz/Developpements/sletz.github.io/attackey -pwa 
-
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/baliphone/baliphone.dsp /Users/letz/Developpements/sletz.github.io/baliphone -pwa 
-
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/drone/drone.dsp /Users/letz/Developpements/sletz.github.io/drone -pwa 
-
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/sequenceur/sequenceur.dsp /Users/letz/Developpements/sletz.github.io/sequenceur -pwa 
-
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/shakerxy/shakerxy.dsp /Users/letz/Developpements/sletz.github.io/shakerxy -pwa 
-
-node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/sinusoide/sinusoide.dsp /Users/letz/Developpements/sletz.github.io/sinusoide -pwa 
-
-
-#node scripts/faust2wasm.js /Users/letz/Developpements/GameLAN/test.dsp /Users/letz/Developpements/sletz.github.io/out -standalone 
-#node scripts/faust2wasm.js test/organ.dsp /Users/letz/Developpements/sletz.github.io/organ -poly -standalone 
-
-#node scripts/faust2wasm.js test/organ1.dsp /Users/letz/Developpements/sletz.github.io/organ1 -poly -standalone 
-
-#node scripts/faust2wasm.js test/osc2.dsp /Users/letz/Developpements/sletz.github.io/osc2 -standalone 
-
-#node scripts/faust2wasm.js /Users/letz/Developpements/faust-sampler/sampler.dsp  /Users/letz/Developpements/sletz.github.io/sampler -poly -standalone 
-
-#node scripts/faust2wasm.js /Users/letz/Developpements/faust-sampler/piano.dsp  /Users/letz/Developpements/sletz.github.io/piano -poly -standalone