From 26785f2d75db0ec629a21df2749820ca3e8b7d9d Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 6 Jul 2022 20:18:17 +0100 Subject: [PATCH] Ildaeil: enable JSFX by default for wasm Signed-off-by: falkTX --- plugins/Cardinal/src/Ildaeil.cpp | 11 +++++++---- src/Makefile.cardinal.mk | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/Cardinal/src/Ildaeil.cpp b/plugins/Cardinal/src/Ildaeil.cpp index 112b476..64bc877 100644 --- a/plugins/Cardinal/src/Ildaeil.cpp +++ b/plugins/Cardinal/src/Ildaeil.cpp @@ -689,7 +689,11 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner { } } fRunnerData; + #ifdef CARLA_OS_WASM + PluginType fPluginType = PLUGIN_JSFX; + #else PluginType fPluginType = PLUGIN_LV2; + #endif PluginType fNextPluginType = fPluginType; uint fPluginCount = 0; int fPluginSelected = -1; @@ -1152,7 +1156,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner { if (isRunnerActive()) stopRunner(); - fRunnerData.needsReinit = true; + fRunnerData.init(); return startRunner(); } @@ -1176,9 +1180,6 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner { break; } - if (path != nullptr) - carla_set_engine_option(module->fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, fPluginType, path); - fPluginCount = 0; delete[] fPlugins; @@ -1551,11 +1552,13 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner { if (ImGui::Button("Load Plugin")) fIdleState = kIdleLoadSelectedPlugin; + #ifndef CARLA_OS_WASM if (fPluginType != PLUGIN_INTERNAL && (module == nullptr || module->canUseBridges)) { ImGui::SameLine(); ImGui::Checkbox("Run in bridge mode", &fPluginWillRunInBridgeMode); } + #endif ImGui::EndDisabled(); diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index a0d4fef..c6459a0 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -205,6 +205,7 @@ BASE_FLAGS += -Wno-unused-variable # extra linker flags ifeq ($(WASM),true) +LINK_FLAGS += --preload-file=./jsfx LINK_FLAGS += --preload-file=./resources LINK_FLAGS += -sALLOW_MEMORY_GROWTH LINK_FLAGS += -sEXPORTED_RUNTIME_METHODS=FS,cwrap