From 2c62e09f003b6600deee1ad3f66bc0bd844d13b1 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 21 Apr 2025 15:55:21 -0700 Subject: [PATCH] Simplify AUDIO_WORKLET checks. NFC I assume the idea here was that there would be an AUDIO_WORKLET=2 mode but that was never added. --- site/source/docs/api_reference/wasm_audio_worklets.rst | 2 +- src/audio_worklet.js | 2 +- src/settings_internal.js | 3 --- tools/link.py | 7 +++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/site/source/docs/api_reference/wasm_audio_worklets.rst b/site/source/docs/api_reference/wasm_audio_worklets.rst index 2f0cb9fdc849c..95a20f0cae53c 100644 --- a/site/source/docs/api_reference/wasm_audio_worklets.rst +++ b/site/source/docs/api_reference/wasm_audio_worklets.rst @@ -165,7 +165,7 @@ which resumes the audio context when the user clicks on the DOM Canvas element t return true; // Keep the graph output going } -And that's it! Compile the code with the linker flags ``-sAUDIO_WORKLET=1 -sWASM_WORKERS=1`` to enable targeting AudioWorklets. +And that's it! Compile the code with the linker flags ``-sAUDIO_WORKLET -sWASM_WORKERS`` to enable targeting AudioWorklets. Synchronizing audio thread with the main thread =============================================== diff --git a/src/audio_worklet.js b/src/audio_worklet.js index 6ed827af22e7d..7f19d6404a25b 100644 --- a/src/audio_worklet.js +++ b/src/audio_worklet.js @@ -1,5 +1,5 @@ // This file is the main bootstrap script for Wasm Audio Worklets loaded in an -// Emscripten application. Build with -sAUDIO_WORKLET=1 linker flag to enable +// Emscripten application. Build with -sAUDIO_WORKLET linker flag to enable // targeting Audio Worklets. // AudioWorkletGlobalScope does not have a onmessage/postMessage() functionality diff --git a/src/settings_internal.js b/src/settings_internal.js index b2e27cf3f0707..44dfca3f5a2ad 100644 --- a/src/settings_internal.js +++ b/src/settings_internal.js @@ -137,9 +137,6 @@ var WASM_BINARY_FILE = ''; // name of the file containing the Wasm Worker *.ww.js, if relevant var WASM_WORKER_FILE = ''; -// name of the file containing the Audio Worklet *.aw.js, if relevant -var AUDIO_WORKLET_FILE = ''; - // Base URL the source mapfile, if relevant var SOURCE_MAP_BASE = ''; diff --git a/tools/link.py b/tools/link.py index 514f41ad52413..522d6e2e25eaa 100644 --- a/tools/link.py +++ b/tools/link.py @@ -1421,8 +1421,6 @@ def limit_incoming_module_api(): default_setting('WASM_BIGINT', feature_matrix.caniuse(feature_matrix.Feature.JS_BIGINT_INTEGRATION)) if settings.AUDIO_WORKLET: - if settings.AUDIO_WORKLET == 1: - settings.AUDIO_WORKLET_FILE = unsuffixed(os.path.basename(target)) + '.aw.js' add_system_js_lib('libwebaudio.js') if not settings.MINIMAL_RUNTIME: # If we are in the audio worklet environment, we can only access the Module object @@ -2178,8 +2176,9 @@ def phase_final_emitting(options, target, js_target, wasm_target): create_worker_file('src/wasm_worker.js', target_dir, settings.WASM_WORKER_FILE, options) # Deploy the Audio Worklet module bootstrap file (*.aw.js) - if settings.AUDIO_WORKLET == 1: - create_worker_file('src/audio_worklet.js', target_dir, settings.AUDIO_WORKLET_FILE, options) + if settings.AUDIO_WORKLET: + audio_worklet_file = unsuffixed_basename(js_target) + '.aw.js' + create_worker_file('src/audio_worklet.js', target_dir, audio_worklet_file, options) if settings.MODULARIZE and settings.MODULARIZE != 'instance': modularize()