From dabfd5d884035b67b9438a01274ec505f0c9389a Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 29 Dec 2021 18:08:24 +0000 Subject: [PATCH] Allow to skip RtAudio fallback in JACK/Standalone mode Signed-off-by: falkTX --- Makefile.base.mk | 4 ++++ distrho/src/jackbridge/JackBridge.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.base.mk b/Makefile.base.mk index c4b0e05c..9f4c3f6e 100644 --- a/Makefile.base.mk +++ b/Makefile.base.mk @@ -262,6 +262,9 @@ endif HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true) +ifeq ($(SKIP_RTAUDIO_FALLBACK),true) +CXXFLAGS += DPF_JACK_STANDALONE_SKIP_RTAUDIO_FALLBACK +else ifeq ($(MACOS),true) HAVE_RTAUDIO = true else ifeq ($(WINDOWS),true) @@ -275,6 +278,7 @@ else ifeq ($(HAVE_PULSEAUDIO),true) HAVE_RTAUDIO = true endif endif +endif # backwards compat HAVE_JACK = true diff --git a/distrho/src/jackbridge/JackBridge.cpp b/distrho/src/jackbridge/JackBridge.cpp index 64f50a39..02adf0f4 100644 --- a/distrho/src/jackbridge/JackBridge.cpp +++ b/distrho/src/jackbridge/JackBridge.cpp @@ -36,7 +36,7 @@ #include "../../extra/LibraryUtils.hpp" // in case JACK fails, we fallback to RtAudio's native API -#ifdef DISTRHO_PROPER_CPP11_SUPPORT +#if defined(DISTRHO_PROPER_CPP11_SUPPORT) && !defined(DPF_JACK_STANDALONE_SKIP_RTAUDIO_FALLBACK) # include "RtAudioBridge.hpp" # ifdef RTAUDIO_API_TYPE # include "rtaudio/RtAudio.cpp"