Browse Source

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

Signed-off-by: falkTX <falktx@falktx.com>
pull/321/head
falkTX 2 years ago
parent
commit
33ee09ae71
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 19 additions and 5 deletions
  1. +11
    -1
      Makefile.base.mk
  2. +4
    -0
      distrho/extra/Thread.hpp
  3. +4
    -4
      distrho/src/jackbridge/SDLBridge.hpp

+ 11
- 1
Makefile.base.mk View File

@@ -89,13 +89,23 @@ endif
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# Set PKG_CONFIG (can be overridden by environment variable) # 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 # Build statically on Windows by default
PKG_CONFIG ?= pkg-config --static PKG_CONFIG ?= pkg-config --static
else else
PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config
endif endif


# ---------------------------------------------------------------------------------------------------------------------
# Set cross compiling flag

ifeq ($(WASM),true)
CROSS_COMPILING = true
endif

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# Set LINUX_OR_MACOS # Set LINUX_OR_MACOS




+ 4
- 0
distrho/extra/Thread.hpp View File

@@ -25,6 +25,10 @@
# include <sys/prctl.h> # include <sys/prctl.h>
#endif #endif


#ifdef DISTRHO_OS_WASM
# error Threads do not work under wasm!
#endif

START_NAMESPACE_DISTRHO START_NAMESPACE_DISTRHO


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


+ 4
- 4
distrho/src/jackbridge/SDLBridge.hpp View File

@@ -194,15 +194,15 @@ struct SDLBridge {


float* const fstream = (float*)stream; float* const fstream = (float*)stream;


#if DISTRHO_PLUGIN_NUM_OUTPUTS == 0
// #if DISTRHO_PLUGIN_NUM_OUTPUTS == 0
if (self->jackProcessCallback == nullptr) if (self->jackProcessCallback == nullptr)
#endif
// #endif
{ {
std::memset(fstream, 0, len); std::memset(fstream, 0, len);
return; 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); const uint numFrames = static_cast<uint>(static_cast<uint>(len) / sizeof(float) / DISTRHO_PLUGIN_NUM_OUTPUTS);


self->jackProcessCallback(numFrames, self->jackProcessArg); self->jackProcessCallback(numFrames, self->jackProcessArg);
@@ -212,7 +212,7 @@ struct SDLBridge {
for (uint j=0; j < numFrames; ++j) for (uint j=0; j < numFrames; ++j)
fstream[j * DISTRHO_PLUGIN_NUM_OUTPUTS + i] = self->audioBuffers[DISTRHO_PLUGIN_NUM_INPUTS+i][j]; fstream[j * DISTRHO_PLUGIN_NUM_OUTPUTS + i] = self->audioBuffers[DISTRHO_PLUGIN_NUM_INPUTS+i][j];
} }
#endif
// #endif
} }


}; };


Loading…
Cancel
Save