Skip to content

wasm: defer first engine start + fix ffmpeg SDK path #2129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcelerier merged 2 commits into from
Jul 19, 2026
+14 −8
Merged

wasm: defer first engine start + fix ffmpeg SDK path #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fea9f0
audio: defer the first wasm engine start out of document loading
jcelerier Jul 19, 2026
7bcf016
media: use OSSIA_SDK for the wasm ffmpeg lib paths
jcelerier Jul 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/plugins/score-plugin-audio/Audio/AudioApplicationPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <ossia/audio/audio_engine.hpp>
#include <ossia/audio/audio_protocol.hpp>

#include <QTimer>
#include <QToolBar>

SCORE_DECLARE_ACTION(RestartAudio, "Restart Audio", Common, QKeySequence::UnknownKey)
Expand Down Expand Up @@ -160,7 +161,12 @@ try
if(!init)
{
init = true;
start_engine();
// The miniaudio WebAudio backend blocks (emscripten_sleep / ASYNCIFY) while
// waiting for the AudioWorklet to come up. Running that synchronously while
// nested deep inside document loading (loadFile -> on_documentChanged)
// deadlocks the async worklet init. Defer the first engine start to the
// event loop so it runs at a clean stack depth.
QTimer::singleShot(0, this, [this] { start_engine(); });
}
#else
stop_engine();
Expand Down
14 changes: 7 additions & 7 deletions src/plugins/score-plugin-media/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@ if(EMSCRIPTEN)
target_include_directories(${PROJECT_NAME} PUBLIC ${OSSIA_SDK}/ffmpeg/include)
target_link_libraries(${PROJECT_NAME} PUBLIC
-Wl,--start-group
/opt/ossia-sdk-wasm/ffmpeg/lib/libavcodec.a
/opt/ossia-sdk-wasm/ffmpeg/lib/libavdevice.a
/opt/ossia-sdk-wasm/ffmpeg/lib/libavfilter.a
/opt/ossia-sdk-wasm/ffmpeg/lib/libavformat.a
/opt/ossia-sdk-wasm/ffmpeg/lib/libavutil.a
/opt/ossia-sdk-wasm/ffmpeg/lib/libswscale.a
/opt/ossia-sdk-wasm/ffmpeg/lib/libswresample.a
${OSSIA_SDK}/ffmpeg/lib/libavcodec.a
${OSSIA_SDK}/ffmpeg/lib/libavdevice.a
${OSSIA_SDK}/ffmpeg/lib/libavfilter.a
${OSSIA_SDK}/ffmpeg/lib/libavformat.a
${OSSIA_SDK}/ffmpeg/lib/libavutil.a
${OSSIA_SDK}/ffmpeg/lib/libswscale.a
${OSSIA_SDK}/ffmpeg/lib/libswresample.a
-Wl,--end-group
)
elseif(TARGET avcodec)
Expand Down
Loading