Misc

source/backend/engine/CarlaEngineBridge.cpp

@@ -263,25 +263,19 @@ public:
         fIsRunning = true;
 
         // TODO - set RT permissions
-        carla_stderr("CarlaEngineBridge::run()");
+        carla_debug("CarlaEngineBridge::run()");
 
         for (; ! shouldExit();)
         {
-            carla_stderr("running loop");
             if (! jackbridge_sem_timedwait(&fShmControl.data->runServer, 5))
             {
                 if (errno == ETIMEDOUT)
                 {
-                    carla_stderr("running loop - QUIT TIMED OUT");
                     fIsRunning = false;
                     signalShouldExit();
                     return;
                 }
-                else
-                    carla_stderr("running loop - OTHER ERROR : %s", std::strerror(errno));
             }
-            else
-                carla_stderr("running loop - ALL FINE, WE GOT EVENTS!!!");
 
             for (; fShmControl.isDataAvailable();)
             {

source/bridges/Makefile

@@ -724,11 +724,8 @@ doxygen: carla_bridge.doxygen
 .FORCE:
 .PHONY: .FORCE
 
-../modules/jackbridge-win32.dll: .FORCE
-	$(MAKE) -C ../modules jackbridge-win32e
-
-../modules/jackbridge-win64.dll: .FORCE
-	$(MAKE) -C ../modules jackbridge-win64e
+../modules/jackbridge-%.dll: .FORCE
+	$(MAKE) -C ../modules jackbridge-$*e
 
 ../modules/juce_audio_basics.%.a: .FORCE
 	$(MAKE) -C ../modules juce_audio_basics_$*

source/modules/Makefile

@@ -139,6 +139,22 @@ theme.qt5:
 jackbridge:
 	$(MAKE) -C jackbridge
 
+# --------------------------------------------------------------
+
+jackbridge-posix32:
+	$(MAKE) -C jackbridge posix32
+
+jackbridge-posix64:
+	$(MAKE) -C jackbridge posix64
+
+jackbridge-posix32e:
+	$(MAKE) -C jackbridge posix32e
+
+jackbridge-posix64e:
+	$(MAKE) -C jackbridge posix64e
+
+# --------------------------------------------------------------
+
 jackbridge-win32:
 	$(MAKE) -C jackbridge win32
 

source/modules/jackbridge/Makefile

@@ -15,25 +15,29 @@ LINK_FLAGS      += $(JACKBRIDGE_LIBS)
 
 WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine
 WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
-WINE_LINK_FLAGS  = $(LINK_FLAGS)
-# -ldl -lrt -lpthread
-
-OBJS         = JackBridge1.cpp.o         JackBridge2.cpp.o
-OBJS_posix32 = JackBridge1.cpp.posix32.o JackBridge2.cpp.posix32.o
-OBJS_posix64 = JackBridge1.cpp.posix64.o JackBridge2.cpp.posix64.o
-OBJS_win32   = JackBridge1.cpp.win32.o   JackBridge2.cpp.win32.o
-OBJS_win64   = JackBridge1.cpp.win64.o   JackBridge2.cpp.win64.o
-OBJS_win64e  = JackBridge1.cpp.win64e.o  JackBridge2.cpp.win64e.o
-OBJS_win32e  = JackBridge1.cpp.win32e.o  JackBridge2.cpp.win32e.o
-OBJS_wine32  = JackBridge1.cpp.wine32.o  JackBridge2.cpp.wine32.o
-OBJS_wine64  = JackBridge1.cpp.wine64.o  JackBridge2.cpp.wine64.o
+WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread
+
+OBJS          = JackBridge1.cpp.o          JackBridge2.cpp.o
+OBJS_posix32  = JackBridge1.cpp.posix32.o  JackBridge2.cpp.posix32.o
+OBJS_posix64  = JackBridge1.cpp.posix64.o  JackBridge2.cpp.posix64.o
+OBJS_posix32e = JackBridge1.cpp.posix32e.o JackBridge2.cpp.posix32e.o
+OBJS_posix64e = JackBridge1.cpp.posix64e.o JackBridge2.cpp.posix64e.o
+OBJS_win32    = JackBridge1.cpp.win32.o    JackBridge2.cpp.win32.o
+OBJS_win64    = JackBridge1.cpp.win64.o    JackBridge2.cpp.win64.o
+OBJS_win64e   = JackBridge1.cpp.win64e.o   JackBridge2.cpp.win64e.o
+OBJS_win32e   = JackBridge1.cpp.win32e.o   JackBridge2.cpp.win32e.o
+OBJS_wine32   = JackBridge1.cpp.wine32.o   JackBridge2.cpp.wine32.o
+OBJS_wine64   = JackBridge1.cpp.wine64.o   JackBridge2.cpp.wine64.o
 
 # --------------------------------------------------------------
 
 all: ../jackbridge.a
 
-posix32: ../jackbridge.posix32.a
-posix64: ../jackbridge.posix64.a
+posix32:  ../jackbridge.posix32.a
+posix64:  ../jackbridge.posix64.a
+posix32e: ../jackbridge-posix32e.so
+posix64e: ../jackbridge-posix64e.so
+
 win32:   ../jackbridge.win32.a
 win64:   ../jackbridge.win64.a
 win32e:  ../jackbridge-win32.dll
@@ -74,6 +78,14 @@ wine64:  ../jackbridge-win64.dll.so
 
 # --------------------------------------------------------------
 
+../jackbridge-posix32e.so: $(OBJS_posix32e)
+	$(CXX) $^ -shared $(LINK_FLAGS) $(32BIT_FLAGS) -o $@
+
+../jackbridge-posix64e.so: $(OBJS_posix64e)
+	$(CXX) $^ -shared $(LINK_FLAGS) $(64BIT_FLAGS) -o $@
+
+# --------------------------------------------------------------
+
 ../jackbridge-win32.dll: $(OBJS_win32e)
 	$(CXX) $^ -shared $(LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
 
@@ -94,6 +106,12 @@ wine64:  ../jackbridge-win64.dll.so
 %.posix64.o: %
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
+%.posix32e.o: %
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -DJACKBRIDGE_EXPORT -c -o $@
+
+%.posix64e.o: %
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -DJACKBRIDGE_EXPORT -c -o $@
+
 %.win32.o: %
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
@@ -124,31 +142,3 @@ debug:
 	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
-
-# win32:  ../jackbridge-win32.dll
-# win64:  ../jackbridge-win64.dll
-# wine32: ../jackbridge-win32.dll.so
-# wine64: ../jackbridge-win64.dll.so
-
-# BUILD_CXX_FLAGS += -DJACKBRIDGE_EXPORT
-
-# WIN_BUILD_FLAGS  = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DUMMY=1
-# WIN_32BIT_FLAGS  = $(32BIT_FLAGS)
-# WIN_64BIT_FLAGS  = $(64BIT_FLAGS)
-# WIN_LINK_FLAGS   = $(LINK_FLAGS)
-#
-# OBJSw32 = JackBridge1.w32.o JackBridge2.w32.o
-# OBJSw64 = JackBridge1.w64.o JackBridge2.w64.o
-
-# JackBridge%.w32.o: JackBridge%.cpp
-# 	$(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) -c -o $@
-#
-# JackBridge%.w64.o: JackBridge%.cpp
-# 	$(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) -c -o $@
-
-# ../jackbridge-win32.dll: $(OBJS)
-# 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
-#
-# ../jackbridge-win64.dll: $(OBJS)
-# 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
-#