Always have JACK enabled for example plugins

Makefile.base.mk

@@ -245,9 +245,11 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Check for optional libraries
 
-HAVE_JACK  = $(shell $(PKG_CONFIG) --exists jack && echo true)
 HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true)
 
+# backwards compat
+HAVE_JACK = true
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set Generic DGL stuff
 
@@ -355,11 +357,6 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Set optional libraries specific stuff
 
-ifeq ($(HAVE_JACK),true)
-JACK_FLAGS   = $(shell $(PKG_CONFIG) --cflags jack)
-JACK_LIBS    = $(shell $(PKG_CONFIG) --libs jack)
-endif
-
 ifeq ($(HAVE_LIBLO),true)
 LIBLO_FLAGS  = $(shell $(PKG_CONFIG) --cflags liblo)
 LIBLO_LIBS   = $(shell $(PKG_CONFIG) --libs liblo)

Makefile.plugins.mk

@@ -41,14 +41,13 @@ endif
 BUILD_C_FLAGS   += -I.
 BUILD_CXX_FLAGS += -I. -I$(DPF_PATH)/distrho -I$(DPF_PATH)/dgl
 
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
 ifeq ($(HAVE_LIBLO),true)
 BASE_FLAGS += -DHAVE_LIBLO
 endif
 
+# backwards compat
+BASE_FLAGS += -DHAVE_JACK
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set files to build
 
@@ -214,7 +213,7 @@ $(BUILD_DIR)/DistrhoUI_macOS_%.mm.o: $(DPF_PATH)/distrho/DistrhoUI_macOS.mm
 $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o: $(DPF_PATH)/distrho/DistrhoPluginMain.cpp
 	-@mkdir -p $(BUILD_DIR)
 	@echo "Compiling DistrhoPluginMain.cpp (JACK)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(JACK_FLAGS) -DDISTRHO_PLUGIN_TARGET_JACK -c -o $@
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DDISTRHO_PLUGIN_TARGET_JACK -c -o $@
 
 $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o: $(DPF_PATH)/distrho/DistrhoUIMain.cpp
 	-@mkdir -p $(BUILD_DIR)
@@ -233,7 +232,7 @@ $(jack): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o
 endif
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating JACK standalone for $(NAME)"
-	$(SILENT)$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(JACK_LIBS) -o $@
+	$(SILENT)$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # LADSPA

distrho/src/DistrhoPluginJACK.cpp

@@ -23,7 +23,7 @@
 # include "../extra/Sleep.hpp"
 #endif
 
-#include "jackbridge/JackBridge1.cpp"
+#include "jackbridge/JackBridge.cpp"
 #include "lv2/lv2.h"
 
 #ifndef DISTRHO_OS_WINDOWS
@@ -714,10 +714,10 @@ private:
     {
         DISTRHO_SAFE_ASSERT_RETURN(fPortMidiOutBuffer != nullptr, false);
 
-        return jack_midi_event_write(fPortMidiOutBuffer,
-                                     midiEvent.frame,
-                                     midiEvent.size > MidiEvent::kDataSize ? midiEvent.dataExt : midiEvent.data,
-                                     midiEvent.size) == 0;
+        return jackbridge_midi_event_write(fPortMidiOutBuffer,
+                                           midiEvent.frame,
+                                           midiEvent.size > MidiEvent::kDataSize ? midiEvent.dataExt : midiEvent.data,
+                                           midiEvent.size) == 0;
     }
 
     static bool writeMidiCallback(void* ptr, const MidiEvent& midiEvent)

examples/CVPort/Makefile

@@ -23,10 +23,7 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-
 TARGETS += lv2_dsp
 
 all: $(TARGETS)

examples/CairoUI/Makefile

@@ -32,9 +32,7 @@ include ../../Makefile.plugins.mk
 
 ifeq ($(HAVE_CAIRO),true)
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
 ifeq ($(HAVE_LIBLO),true)

examples/ExternalUI/Makefile

@@ -31,10 +31,7 @@ endif
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-
 TARGETS += dssi
 TARGETS += lv2_sep
 

examples/FileHandling/Makefile

@@ -27,13 +27,8 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif
-endif
-
-ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp

examples/ImguiSimpleGain/Makefile

@@ -34,9 +34,7 @@ LINK_FLAGS += $(shell $(PKG_CONFIG) glew --libs)
 
 ifeq ($(HAVE_OPENGL),true)
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
 ifeq ($(HAVE_LIBLO),true)

examples/Info/Makefile

@@ -28,13 +28,10 @@ include ../../Makefile.plugins.mk
 
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif # HAVE_OPENGL
-
-ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
-endif
+endif # HAVE_OPENGL
 
 TARGETS += vst
 

examples/Meters/Makefile

@@ -28,9 +28,7 @@ include ../../Makefile.plugins.mk
 
 ifeq ($(HAVE_OPENGL),true)
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
 ifeq ($(HAVE_LIBLO),true)

examples/Metronome/Makefile

@@ -23,18 +23,8 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
-ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif
-endif
-
-ifeq ($(HAVE_OPENGL),true)
-TARGETS += lv2_sep
-else
 TARGETS += lv2_dsp
-endif
-
 TARGETS += vst
 
 all: $(TARGETS)

examples/MidiThrough/Makefile

@@ -23,9 +23,7 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
 TARGETS += lv2_dsp
 TARGETS += vst
 

examples/Parameters/Makefile

@@ -26,11 +26,9 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
 endif # HAVE_OPENGL
-endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
 TARGETS += ladspa

examples/SendNote/Makefile

@@ -27,13 +27,8 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif
-endif
-
-ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp

examples/States/Makefile

@@ -26,11 +26,9 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
 endif # HAVE_OPENGL
-endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
 TARGETS += dssi