DPF

DISTRHO Plugin Framework
Log | Files | Refs | Submodules | README | LICENSE

commit 33ee09ae7126a688d380f51fe0ba4eab6ed391c1
parent 3aa2e83debdc096fe247829ecdebf11d57ab57e6
Author: falkTX <falktx@falktx.com>
Date:   Mon,  4 Jul 2022 20:41:44 +0100

A few more wasm tweaks, do not allow Thread.hpp usage

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
MMakefile.base.mk | 12+++++++++++-
Mdistrho/extra/Thread.hpp | 4++++
Mdistrho/src/jackbridge/SDLBridge.hpp | 8++++----
3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Makefile.base.mk b/Makefile.base.mk @@ -89,7 +89,10 @@ endif # --------------------------------------------------------------------------------------------------------------------- # Set PKG_CONFIG (can be overridden by environment variable) -ifeq ($(WINDOWS),true) +ifeq ($(WASM),true) +# Skip on wasm by default +PKG_CONFIG ?= false +else ifeq ($(WINDOWS),true) # Build statically on Windows by default PKG_CONFIG ?= pkg-config --static else @@ -97,6 +100,13 @@ PKG_CONFIG ?= pkg-config endif # --------------------------------------------------------------------------------------------------------------------- +# Set cross compiling flag + +ifeq ($(WASM),true) +CROSS_COMPILING = true +endif + +# --------------------------------------------------------------------------------------------------------------------- # Set LINUX_OR_MACOS ifeq ($(LINUX),true) diff --git a/distrho/extra/Thread.hpp b/distrho/extra/Thread.hpp @@ -25,6 +25,10 @@ # include <sys/prctl.h> #endif +#ifdef DISTRHO_OS_WASM +# error Threads do not work under wasm! +#endif + START_NAMESPACE_DISTRHO // ----------------------------------------------------------------------- diff --git a/distrho/src/jackbridge/SDLBridge.hpp b/distrho/src/jackbridge/SDLBridge.hpp @@ -194,15 +194,15 @@ struct SDLBridge { float* const fstream = (float*)stream; -#if DISTRHO_PLUGIN_NUM_OUTPUTS == 0 +// #if DISTRHO_PLUGIN_NUM_OUTPUTS == 0 if (self->jackProcessCallback == nullptr) -#endif +// #endif { std::memset(fstream, 0, len); return; } -#if DISTRHO_PLUGIN_NUM_OUTPUTS > 0 +// #if DISTRHO_PLUGIN_NUM_OUTPUTS > 0 const uint numFrames = static_cast<uint>(static_cast<uint>(len) / sizeof(float) / DISTRHO_PLUGIN_NUM_OUTPUTS); self->jackProcessCallback(numFrames, self->jackProcessArg); @@ -212,7 +212,7 @@ struct SDLBridge { for (uint j=0; j < numFrames; ++j) fstream[j * DISTRHO_PLUGIN_NUM_OUTPUTS + i] = self->audioBuffers[DISTRHO_PLUGIN_NUM_INPUTS+i][j]; } -#endif +// #endif } };