More of the same

c++/Makefile.mk

@@ -35,10 +35,10 @@ ifneq ($(DEBUG),true)
 BUILD_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT
 endif
 
-# Comment this line to not use vestige header in Carla
+# Comment this line to not use vestige header
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 
-# Modify to enable/disable features
+# Modify to enable/disable specific features
 CARLA_PLUGIN_SUPPORT   = true
 CARLA_SAMPLERS_SUPPORT = true
 CARLA_RTAUDIO_SUPPORT  = false

c++/carla-discovery/Makefile

@@ -66,6 +66,8 @@ carla-discovery-win32.exe: $(OBJS) ../carla-lilv/carla_lilv_win32.a
 carla-discovery-win64.exe: $(OBJS) ../carla-lilv/carla_lilv_win64.a
 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ && $(STRIP) $@
 
+# --------------------------------------------------------------
+
 ../carla-lilv/carla_lilv.a:
 	$(MAKE) -C ../carla-lilv
 

c++/carla-jackbridge/Makefile

@@ -8,7 +8,7 @@ include ../Makefile.mk
 
 WINECXX ?= wineg++
 
-BUILD_CXX_FLAGS += -I../carla-includes
+BUILD_CXX_FLAGS += -I. -I../carla-includes
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags jack QtCore)
 LINK_FLAGS      += -shared
 
@@ -41,11 +41,11 @@ libcarla-jackbridge-win32.dll: $(OBJS)
 libcarla-jackbridge-win64.dll: $(OBJS)
 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ && $(STRIP) $@
 
-libcarla-jackbridge-win32.dll.so: $(OBJS)
-	$(WINECXX) $^ libcarla-jackbridge-win32.dll.def $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ && $(STRIP) $@
+libcarla-jackbridge-win32.dll.so: $(OBJS) libcarla-jackbridge-win32.dll.def
+	$(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ && $(STRIP) $@
 
-libcarla-jackbridge-win64.dll.so: $(OBJS)
-	$(WINECXX) $^ libcarla-jackbridge-win64.dll.def $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ && $(STRIP) $@
+libcarla-jackbridge-win64.dll.so: $(OBJS) libcarla-jackbridge-win64.dll.def
+	$(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ && $(STRIP) $@
 
 # --------------------------------------------------------------
 

c++/carla-jackbridge/carla_jackbridge.cpp

@@ -211,10 +211,10 @@ uint32_t jackbridge_midi_get_event_count(void* port_buffer)
 #endif
 }
 
-int jackbridge_midi_event_get(jackbridge_midi_event_t* event, void* port_buffer, uint32_t event_index)
+int jackbridge_midi_event_get(jack_midi_event_t* event, void* port_buffer, uint32_t event_index)
 {
 #ifndef JACKBRIDGE_DUMMY
-    return jack_midi_event_get((jack_midi_event_t*)event, port_buffer, event_index);
+    return jack_midi_event_get(event, port_buffer, event_index);
 #else
     return 0;
 #endif
@@ -227,7 +227,7 @@ void jackbridge_midi_clear_buffer(void* port_buffer)
 #endif
 }
 
-jackbridge_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size)
+jack_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size)
 {
 #ifndef JACKBRIDGE_DUMMY
     return jack_midi_event_reserve(port_buffer, time, data_size);
@@ -236,10 +236,10 @@ jackbridge_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nf
 #endif
 }
 
-int jackbridge_midi_event_write(void* port_buffer, jack_nframes_t time, const jackbridge_midi_data_t* data, size_t data_size)
+int jackbridge_midi_event_write(void* port_buffer, jack_nframes_t time, const jack_midi_data_t* data, size_t data_size)
 {
 #ifndef JACKBRIDGE_DUMMY
-    return jack_midi_event_write(port_buffer, time, (jack_midi_data_t*)data, data_size);
+    return jack_midi_event_write(port_buffer, time, data, data_size);
 #else
     return 0;
 #endif

c++/carla-jackbridge/carla_jackbridge.h

@@ -26,14 +26,6 @@
 
 #ifdef BUILD_BRIDGE
 
-typedef unsigned char jackbridge_midi_data_t;
-
-struct jackbridge_midi_event_t {
-    jack_nframes_t          time;
-    size_t                  size;
-    jackbridge_midi_data_t* buffer;
-};
-
 CARLA_EXPORT jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...);
 CARLA_EXPORT int jackbridge_client_close(jack_client_t* client);
 CARLA_EXPORT int jackbridge_client_name_size();
@@ -57,18 +49,15 @@ CARLA_EXPORT int jackbridge_port_unregister(jack_client_t* client, jack_port_t*
 CARLA_EXPORT void* jackbridge_port_get_buffer(jack_port_t* port, jack_nframes_t nframes);
 
 CARLA_EXPORT uint32_t jackbridge_midi_get_event_count(void* port_buffer);
-CARLA_EXPORT int jackbridge_midi_event_get(jackbridge_midi_event_t* event, void* port_buffer, uint32_t event_index);
+CARLA_EXPORT int jackbridge_midi_event_get(jack_midi_event_t* event, void* port_buffer, uint32_t event_index);
 CARLA_EXPORT void jackbridge_midi_clear_buffer(void* port_buffer);
-CARLA_EXPORT jackbridge_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size);
-CARLA_EXPORT int jackbridge_midi_event_write(void* port_buffer, jack_nframes_t time, const jackbridge_midi_data_t* data, size_t data_size);
+CARLA_EXPORT jack_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size);
+CARLA_EXPORT int jackbridge_midi_event_write(void* port_buffer, jack_nframes_t time, const jack_midi_data_t* data, size_t data_size);
 
 CARLA_EXPORT jack_transport_state_t jackbridge_transport_query(const jack_client_t* client, jack_position_t* pos);
 
 #else
 
-#define jackbridge_midi_data_t jack_midi_data_t
-#define jackbridge_midi_event_t jack_midi_event_t
-
 #define jackbridge_client_open jack_client_open
 #define jackbridge_client_close jack_client_close
 #define jackbridge_client_name_size jack_client_name_size

c++/carla-rtmempool/Makefile

@@ -4,14 +4,10 @@
 # Created by falkTX
 #
 
-CC ?= gcc
-AR ?= ar
+include ../Makefile.mk
 
-BUILD_FLAGS  = -O2 -ffast-math -fomit-frame-pointer -fvisibility=hidden -fPIC -mtune=generic -msse -mfpmath=sse -std=c99 -Wall $(CFLAGS)
-BUILD_FLAGS += -I../carla-includes
-
-32BIT_FLAGS  = -m32
-64BIT_FLAGS  = -m64
+BUILD_C_FLAGS += -fvisibility=hidden -fPIC
+BUILD_C_FLAGS += -I. -I../carla-includes
 
 OBJS         = rtmempool.o
 OBJS_posix32 = rtmempool_posix32.o
@@ -27,7 +23,7 @@ carla_rtmempool.a: $(OBJS)
 	$(AR) rs $@ $^
 
 rtmempool.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
@@ -37,7 +33,7 @@ carla_rtmempool_posix32.a: $(OBJS_posix32)
 	$(AR) rs $@ $^
 
 rtmempool_posix32.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) $(32BIT_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
@@ -47,7 +43,7 @@ carla_rtmempool_posix64.a: $(OBJS_posix64)
 	$(AR) rs $@ $^
 
 rtmempool_posix64.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) $(64BIT_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
@@ -57,7 +53,7 @@ carla_rtmempool_win32.a: $(OBJS_win32)
 	$(AR) rs $@ $^
 
 rtmempool_win32.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) -DPTW32_STATIC_LIB $(32BIT_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_C_FLAGS) -DPTW32_STATIC_LIB $(32BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
@@ -67,7 +63,7 @@ carla_rtmempool_win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
 rtmempool_win64.o: rtmempool.c
-	$(CC) $< $(BUILD_FLAGS) -DPTW32_STATIC_LIB $(64BIT_FLAGS) -c -o $@
+	$(CC) $< $(BUILD_C_FLAGS) -DPTW32_STATIC_LIB $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------