brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ildaeil: enable JSFX by default for wasm

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-07-06 20:18:17 +01:00
parent ef8f30c124
commit 26785f2d75
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/Cardinal/src/Ildaeil.cpp
View file

@ -689,7 +689,11 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
} }
} fRunnerData; } fRunnerData;
#ifdef CARLA_OS_WASM
PluginType fPluginType = PLUGIN_JSFX;
#else
PluginType fPluginType = PLUGIN_LV2; PluginType fPluginType = PLUGIN_LV2;
#endif
PluginType fNextPluginType = fPluginType; PluginType fNextPluginType = fPluginType;
uint fPluginCount = 0; uint fPluginCount = 0;
int fPluginSelected = -1; int fPluginSelected = -1;
@ -1152,7 +1156,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
if (isRunnerActive()) if (isRunnerActive())
stopRunner(); stopRunner();
fRunnerData.needsReinit = true; fRunnerData.init();
return startRunner(); return startRunner();
} }
@ -1176,9 +1180,6 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
break; break;
} }
if (path != nullptr)
carla_set_engine_option(module->fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, fPluginType, path);
fPluginCount = 0; fPluginCount = 0;
delete[] fPlugins; delete[] fPlugins;
@ -1551,11 +1552,13 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
if (ImGui::Button("Load Plugin")) if (ImGui::Button("Load Plugin"))
fIdleState = kIdleLoadSelectedPlugin; fIdleState = kIdleLoadSelectedPlugin;
#ifndef CARLA_OS_WASM
if (fPluginType != PLUGIN_INTERNAL && (module == nullptr || module->canUseBridges)) if (fPluginType != PLUGIN_INTERNAL && (module == nullptr || module->canUseBridges))
{ {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Checkbox("Run in bridge mode", &fPluginWillRunInBridgeMode); ImGui::Checkbox("Run in bridge mode", &fPluginWillRunInBridgeMode);
} }
#endif
ImGui::EndDisabled(); ImGui::EndDisabled();

1
src/Makefile.cardinal.mk
View file

@ -205,6 +205,7 @@ BASE_FLAGS += -Wno-unused-variable
# extra linker flags # extra linker flags
ifeq ($(WASM),true) ifeq ($(WASM),true)
LINK_FLAGS += --preload-file=./jsfx
LINK_FLAGS += --preload-file=./resources LINK_FLAGS += --preload-file=./resources
LINK_FLAGS += -sALLOW_MEMORY_GROWTH LINK_FLAGS += -sALLOW_MEMORY_GROWTH
LINK_FLAGS += -sEXPORTED_RUNTIME_METHODS=FS,cwrap LINK_FLAGS += -sEXPORTED_RUNTIME_METHODS=FS,cwrap