Make JACKBRIDGE_DIRECT simpler to work with

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

source/Makefile.mk

@@ -237,6 +237,14 @@ HAVE_QT4        = $(shell pkg-config --exists QtCore QtGui && echo true)
 HAVE_QT5        = $(shell pkg-config --exists Qt5Core Qt5Gui Qt5Widgets && echo true)
 HAVE_SNDFILE    = $(shell pkg-config --exists sndfile && echo true)
 
+ifeq ($(JACKBRIDGE_DIRECT),true)
+ifeq ($(HAVE_JACK),true)
+BASE_FLAGS += -DJACKBRIDGE_DIRECT
+else
+$(error jackbridge direct mode requested, but jack not available)
+endif
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Check for optional libs (special non-pkgconfig tests)
 
@@ -396,6 +404,12 @@ FLUIDSYNTH_FLAGS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags fluidsynth)
 FLUIDSYNTH_LIBS  = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs fluidsynth)
 endif
 
+ifeq ($(HAVE_JACK),true)
+JACK_FLAGS  = $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags jack)
+JACK_LIBS   = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs jack)
+JACK_LIBDIR = $(shell pkg-config --variable=libdir jack)/jack
+endif
+
 ifeq ($(HAVE_SNDFILE),true)
 SNDFILE_FLAGS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags sndfile)
 SNDFILE_LIBS  = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs sndfile)
@@ -513,10 +527,6 @@ RTMIDI_FLAGS    += -D__WINDOWS_MM__
 endif
 endif
 
-ifeq ($(HAVE_JACK),true)
-JACK_LIBDIR = $(shell pkg-config --variable=libdir jack)/jack
-endif
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 NATIVE_PLUGINS_LIBS += $(DGL_LIBS)

source/backend/Makefile

@@ -84,6 +84,10 @@ STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS)
 STANDALONE_LINK_FLAGS += $(RTMIDI_LIBS)
 endif
 
+ifeq ($(JACKBRIDGE_DIRECT),true)
+STANDALONE_LINK_FLAGS += $(JACK_LIBS)
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 all: $(TARGETS)

source/backend/engine/Makefile

@@ -97,6 +97,13 @@ $(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_EXPORT -c -o $@
 endif
 
+ifeq ($(JACKBRIDGE_DIRECT),true)
+$(OBJDIR)/CarlaEngineJack.cpp.o: CarlaEngineJack.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling CarlaEngineJack.cpp"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(JACK_FLAGS) -c -o $@
+endif
+
 $(OBJDIR)/%.cpp.o: %.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"

source/bridges-plugin/Makefile

@@ -133,6 +133,10 @@ LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
 endif
 endif
 
+ifeq ($(JACKBRIDGE_DIRECT),true)
+LINK_FLAGS += $(JACK_LIBS)
+endif
+
 LINK_FLAGS += $(X11_LIBS)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/jackbridge/JackBridge1.cpp

@@ -1639,7 +1639,7 @@ uint32_t jackbridge_port_type_get_buffer_size(jack_client_t* client, const char*
 {
 #if defined(JACKBRIDGE_DUMMY)
 #elif defined(JACKBRIDGE_DIRECT)
-    return jack_port_type_get_buffer_size(client, port_type);
+    return static_cast<uint32_t>(jack_port_type_get_buffer_size(client, port_type));
 #else
     if (getBridgeInstance().port_type_get_buffer_size_ptr != nullptr)
         return static_cast<uint32_t>(getBridgeInstance().port_type_get_buffer_size_ptr(client, port_type));

source/jackbridge/Makefile

@@ -18,8 +18,8 @@ WINE_64BIT_FLAGS = $(64BIT_FLAGS)
 WINE_LINK_FLAGS  = $(LINK_FLAGS) $(LIBDL_LIBS) -lpthread -lstdc++
 
 ifeq ($(JACKBRIDGE_DIRECT),true)
-BUILD_CXX_FLAGS += $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags jack) -DJACKBRIDGE_DIRECT
-LINK_FLAGS      += $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs jack)
+BUILD_CXX_FLAGS += $(JACK_FLAGS) -DJACKBRIDGE_DIRECT
+LINK_FLAGS      += $(JACK_LIBS)
 endif
 
 ifneq ($(MACOS),true)