Fix last commit; build carla-discovery-native by default

Makefile

@@ -12,16 +12,6 @@ SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")
 PYUIC = pyuic4
 PYRCC = pyrcc4 -py3
 
-# Detect architecture
-ifndef _arch_n
-  ARCH = $(shell uname -m)
-  ifeq ("$(ARCH)", "x86_64")
-    _arch_n = 64
-  else
-    _arch_n = 32
-  endif
-endif
-
 
 all: UI RES CPP
 
@@ -159,7 +149,7 @@ src/resources_rc.py: resources/resources.qrc
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-CPP: carla_backend carla_bridge carla_discovery jackmeter xycontroller
+CPP: carla_backend carla_bridge carla_discovery carla_lilv jackmeter xycontroller
 
 carla_backend: carla_lilv
 	$(MAKE) -C c++/carla-backend
@@ -168,7 +158,7 @@ carla_bridge: carla_lilv
 	$(MAKE) -C c++/carla-bridge
 
 carla_discovery:
-	$(MAKE) -C c++/carla-discovery unix$(_arch_n) NATIVE=1
+	$(MAKE) -C c++/carla-discovery NATIVE=1
 
 carla_lilv:
 	$(MAKE) -C c++/carla-lilv
@@ -205,6 +195,7 @@ clean:
 	$(MAKE) clean -C c++/carla-discovery
 	$(MAKE) clean -C c++/carla-lilv
 	$(MAKE) clean -C c++/jackmeter
+	$(MAKE) clean -C c++/xycontroller
 	rm -f *~ src/*~ src/*.pyc src/ui_*.py src/resources_rc.py
 
 doc:
@@ -240,10 +231,7 @@ install:
 		data/claudia-launcher \
 		data/carla \
 		data/carla-control \
-		c++/carla-bridge/carla-bridge-lv2-gtk2 \
-		c++/carla-bridge/carla-bridge-lv2-qt4 \
-		c++/carla-bridge/carla-bridge-lv2-x11 \
-		c++/carla-bridge/carla-bridge-vst-x11 \
+		c++/carla-bridge/carla-bridge-* \
 		c++/carla-discovery/carla-discovery-* \
 		c++/jackmeter/cadence_jackmeter \
 		c++/xycontroller/cadence_xycontroller \
@@ -286,7 +274,7 @@ install:
 	install -m 644 resources/256x256/claudia.png           $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
 	install -m 644 resources/256x256/claudia-launcher.png  $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
 	install -m 644 resources/256x256/carla.png             $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
-	install -m 644 resources/256x256/carla-control.png      $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
+	install -m 644 resources/256x256/carla-control.png     $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
 
 	# Install icons, scalable
 	install -m 644 resources/scalable/cadence.svg          $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/

c++/carla-discovery/Makefile

@@ -8,7 +8,7 @@ CXX     ?= g++
 WINECXX ?= wineg++
 STRIP   ?= strip
 
-BASE_FLAGS   = -O2 -ffast-math -fomit-frame-pointer -fPIC -mtune=generic -msse -mfpmath=sse
+BASE_FLAGS   = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse
 BASE_FLAGS  += -Wall -I../carla-backend -I../carla-includes
 
 BUILD_FLAGS  = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
@@ -23,15 +23,13 @@ LINK_FLAGS  += $(shell pkg-config --libs QtCore)
 
 ifneq ($(NATIVE),)
 BUILD_FLAGS += -DBUILD_NATIVE
-HAVE_FLUIDSYNTH   = $(shell pkg-config --exists fluidsynth && echo true)
-HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true)
 
-ifeq ($(HAVE_FLUIDSYNTH),true)
+ifeq ($(shell pkg-config --exists fluidsynth && echo true),true)
 BUILD_FLAGS += $(shell pkg-config --cflags fluidsynth) -DWANT_FLUIDSYNTH
 LINK_FLAGS  += $(shell pkg-config --libs fluidsynth)
 endif
 
-ifeq ($(HAVE_LINUXSAMPLER),true)
+ifeq ($(shell pkg-config --exists linuxsampler && echo true),true)
 BUILD_FLAGS += $(shell pkg-config --cflags linuxsampler) -DWANT_LINUXSAMPLER
 LINK_FLAGS  += $(shell pkg-config --libs linuxsampler)
 endif
@@ -54,8 +52,7 @@ WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl
 
 # --------------------------------------------------------------
 
-all:
-	@echo "Build type must be unix32, unix64, win[e]32 or win[e]64"
+all: carla-discovery-native
 
 unix32: carla-discovery-unix32
 unix64: carla-discovery-unix64
@@ -69,6 +66,9 @@ wine64: carla-discovery-win64.exe.so
 32BIT_OBJS = carla-discovery.cpp ../carla-lilv/carla_lilv_32bit.a
 64BIT_OBJS = carla-discovery.cpp ../carla-lilv/carla_lilv_64bit.a
 
+carla-discovery-native: carla-discovery.cpp ../carla-lilv/carla_lilv.a
+	$(CXX) $^ $(BUILD_FLAGS) $(LINK_FLAGS) -o $@ && $(STRIP) $@
+
 carla-discovery-unix32: $(32BIT_OBJS)
 	$(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && $(STRIP) $@
 
@@ -87,6 +87,9 @@ carla-discovery-win32.exe.so: $(32BIT_OBJS)
 carla-discovery-win64.exe.so: $(64BIT_OBJS)
 	$(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win64.exe && $(STRIP) $@
 
+../carla-lilv/carla_lilv.a:
+	$(MAKE) -C ../carla-lilv
+
 ../carla-lilv/carla_lilv_32bit.a:
 	$(MAKE) -C ../carla-lilv 32bit
 

c++/carla-discovery/Makefile.dbg

@@ -23,15 +23,13 @@ LINK_FLAGS  += $(shell pkg-config --libs QtCore)
 
 ifneq ($(NATIVE),)
 BUILD_FLAGS += -DBUILD_NATIVE
-HAVE_FLUIDSYNTH   = $(shell pkg-config --exists fluidsynth && echo true)
-HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true)
 
-ifeq ($(HAVE_FLUIDSYNTH),true)
+ifeq ($(shell pkg-config --exists fluidsynth && echo true),true)
 BUILD_FLAGS += $(shell pkg-config --cflags fluidsynth) -DWANT_FLUIDSYNTH
 LINK_FLAGS  += $(shell pkg-config --libs fluidsynth)
 endif
 
-ifeq ($(HAVE_LINUXSAMPLER),true)
+ifeq ($(shell pkg-config --exists linuxsampler && echo true),true)
 BUILD_FLAGS += $(shell pkg-config --cflags linuxsampler) -DWANT_LINUXSAMPLER
 LINK_FLAGS  += $(shell pkg-config --libs linuxsampler)
 endif
@@ -54,8 +52,7 @@ WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl
 
 # --------------------------------------------------------------
 
-all:
-	@echo "Build type must be unix32, unix64, win[e]32 or win[e]64"
+all: carla-discovery-native
 
 unix32: carla-discovery-unix32
 unix64: carla-discovery-unix64
@@ -69,6 +66,9 @@ wine64: carla-discovery-win64.exe.so
 32BIT_OBJS = carla-discovery.cpp ../carla-lilv/carla_lilv_32bit.a
 64BIT_OBJS = carla-discovery.cpp ../carla-lilv/carla_lilv_64bit.a
 
+carla-discovery-native: carla-discovery.cpp ../carla-lilv/carla_lilv.a
+	$(CXX) $^ $(BUILD_FLAGS) $(LINK_FLAGS) -o $@
+
 carla-discovery-unix32: $(32BIT_OBJS)
 	$(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@
 
@@ -87,6 +87,9 @@ carla-discovery-win32.exe.so: $(32BIT_OBJS)
 carla-discovery-win64.exe.so: $(64BIT_OBJS)
 	$(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win64.exe
 
+../carla-lilv/carla_lilv.a:
+	$(MAKE) -C ../carla-lilv
+
 ../carla-lilv/carla_lilv_32bit.a:
 	$(MAKE) -C ../carla-lilv 32bit
 

src/carla.py

@@ -1798,8 +1798,8 @@ if __name__ == '__main__':
         dname = cString(Carla.Host.get_engine_driver_name(i))
         print("%i - %s" % (i, dname))
 
-    if not Carla.Host.engine_init("JACK", "Carla"):
-    #if not Carla.Host.engine_init("PulseAudio", "Carla"):
+    #if not Carla.Host.engine_init("JACK", "Carla"):
+    if not Carla.Host.engine_init("PulseAudio", "Carla"):
         CustomMessageBox(None, QMessageBox.Critical, "Error", "Could not connect to Audio backend, possible reasons:",
             cString(Carla.Host.get_last_error()), QMessageBox.Ok, QMessageBox.Ok)
         sys.exit(1)

src/carla_backend.py

@@ -92,11 +92,11 @@ if WINDOWS:
     ]
 
     if PROGRAMFILESx86:
-        DEFAULT_LADSPA_PATH_PATH += [
+        DEFAULT_LADSPA_PATH += [
             os.path.join(PROGRAMFILESx86, "LADSPA")
         ]
 
-        DEFAULT_DSSI_PATH_PATH += [
+        DEFAULT_DSSI_PATH += [
             os.path.join(PROGRAMFILESx86, "DSSI")
         ]
 
@@ -182,6 +182,59 @@ else:
         os.path.join("/", "usr", "share", "sounds", "sfz")
     ]
 
+# ------------------------------------------------------------------------------------------------
+# Default Plugin Folders (set)
+
+global LADSPA_PATH, DSSI_PATH, LV2_PATH, VST_PATH, SF2_PATH
+
+LADSPA_PATH_env = os.getenv("LADSPA_PATH")
+DSSI_PATH_env = os.getenv("DSSI_PATH")
+LV2_PATH_env = os.getenv("LV2_PATH")
+VST_PATH_env = os.getenv("VST_PATH")
+GIG_PATH_env = os.getenv("GIG_PATH")
+SF2_PATH_env = os.getenv("SF2_PATH")
+SFZ_PATH_env = os.getenv("SFZ_PATH")
+
+if LADSPA_PATH_env:
+    LADSPA_PATH = LADSPA_PATH_env.split(splitter)
+else:
+    LADSPA_PATH = DEFAULT_LADSPA_PATH
+
+if DSSI_PATH_env:
+    DSSI_PATH = DSSI_PATH_env.split(splitter)
+else:
+    DSSI_PATH = DEFAULT_DSSI_PATH
+
+if LV2_PATH_env:
+    LV2_PATH = LV2_PATH_env.split(splitter)
+else:
+    LV2_PATH = DEFAULT_LV2_PATH
+
+if VST_PATH_env:
+    VST_PATH = VST_PATH_env.split(splitter)
+else:
+    VST_PATH = DEFAULT_VST_PATH
+
+if GIG_PATH_env:
+    GIG_PATH = GIG_PATH_env.split(splitter)
+else:
+    GIG_PATH = DEFAULT_GIG_PATH
+
+if SF2_PATH_env:
+    SF2_PATH = SF2_PATH_env.split(splitter)
+else:
+    SF2_PATH = DEFAULT_SF2_PATH
+
+if SFZ_PATH_env:
+    SFZ_PATH = SFZ_PATH_env.split(splitter)
+else:
+    SFZ_PATH = DEFAULT_SFZ_PATH
+
+if haveLRDF:
+    LADSPA_RDF_PATH_env = os.getenv("LADSPA_RDF_PATH")
+    if LADSPA_RDF_PATH_env:
+        ladspa_rdf.set_rdf_path(LADSPA_RDF_PATH_env.split(splitter))
+
 # ------------------------------------------------------------------------------------------------
 # Search for Carla library and tools
 
@@ -212,7 +265,7 @@ else:
     carla_libname = "carla_backend.so"
 
 CWD   = sys.path[0]
-CWDpp = os.path.join(CWDpp, "..", "c++")
+CWDpp = os.path.join(CWD, "..", "c++")
 
 # make it work with cxfreeze
 if CWD.endswith(os.sep+"carla"):
@@ -649,13 +702,6 @@ class GuiInfo(Structure):
 
 CallbackFunc = CFUNCTYPE(None, c_enum, c_ushort, c_int, c_int, c_double)
 
-if LINUX or MACOS:
-    BINARY_NATIVE = BINARY_UNIX64 if is64bit else BINARY_UNIX32
-elif WINDOWS:
-    BINARY_NATIVE = BINARY_WIN64 if is64bit else BINARY_WIN32
-else:
-    BINARY_NATIVE = BINARY_NONE
-
 # ------------------------------------------------------------------------------------------------
 # Backend C++ -> Python object
 
@@ -671,7 +717,9 @@ class Host(object):
         if lib_prefix_arg:
             carla_library_path = os.path.join(lib_prefix_arg, "lib", "carla", carla_libname)
 
-        print("Host() - using carla-backend library '%s'" % carla_library_path)
+        if not carla_library_path:
+            self.lib = None
+            return
 
         self.lib = cdll.LoadLibrary(carla_library_path)
 
@@ -1012,56 +1060,3 @@ class Host(object):
 
     def get_sample_rate(self):
         return self.lib.get_sample_rate()
-
-# ------------------------------------------------------------------------------------------------
-# Default Plugin Folders (set)
-
-global LADSPA_PATH, DSSI_PATH, LV2_PATH, VST_PATH, SF2_PATH
-
-LADSPA_PATH_env = os.getenv("LADSPA_PATH")
-DSSI_PATH_env = os.getenv("DSSI_PATH")
-LV2_PATH_env = os.getenv("LV2_PATH")
-VST_PATH_env = os.getenv("VST_PATH")
-GIG_PATH_env = os.getenv("GIG_PATH")
-SF2_PATH_env = os.getenv("SF2_PATH")
-SFZ_PATH_env = os.getenv("SFZ_PATH")
-
-if LADSPA_PATH_env:
-    LADSPA_PATH = LADSPA_PATH_env.split(splitter)
-else:
-    LADSPA_PATH = DEFAULT_LADSPA_PATH
-
-if DSSI_PATH_env:
-    DSSI_PATH = DSSI_PATH_env.split(splitter)
-else:
-    DSSI_PATH = DEFAULT_DSSI_PATH
-
-if LV2_PATH_env:
-    LV2_PATH = LV2_PATH_env.split(splitter)
-else:
-    LV2_PATH = DEFAULT_LV2_PATH
-
-if VST_PATH_env:
-    VST_PATH = VST_PATH_env.split(splitter)
-else:
-    VST_PATH = DEFAULT_VST_PATH
-
-if GIG_PATH_env:
-    GIG_PATH = GIG_PATH_env.split(splitter)
-else:
-    GIG_PATH = DEFAULT_GIG_PATH
-
-if SF2_PATH_env:
-    SF2_PATH = SF2_PATH_env.split(splitter)
-else:
-    SF2_PATH = DEFAULT_SF2_PATH
-
-if SFZ_PATH_env:
-    SFZ_PATH = SFZ_PATH_env.split(splitter)
-else:
-    SFZ_PATH = DEFAULT_SFZ_PATH
-
-if haveLRDF:
-    LADSPA_RDF_PATH_env = os.getenv("LADSPA_RDF_PATH")
-    if LADSPA_RDF_PATH_env:
-        ladspa_rdf.set_rdf_path(LADSPA_RDF_PATH_env.split(splitter))

src/shared_carla.py

@@ -17,7 +17,7 @@
 # For a full copy of the GNU General Public License see the COPYING file
 
 # Imports (Global)
-import sys
+import platform, sys
 from copy import deepcopy
 from sip import unwrapinstance
 from PyQt4.QtCore import pyqtSlot, QSettings, QTimer
@@ -187,17 +187,12 @@ Carla.maxParameters = MAX_PARAMETERS
 
 # set native binary type
 if LINUX or MACOS:
-    BINARY_NATIVE = BINARY_UNIX64 if is64bit BINARY_UNIX32
+    BINARY_NATIVE = BINARY_UNIX64 if is64bit else BINARY_UNIX32
 elif WINDOWS:
-    BINARY_NATIVE = BINARY_WIN64 if is64bit BINARY_WIN32
+    BINARY_NATIVE = BINARY_WIN64 if is64bit else BINARY_WIN32
 else:
     BINARY_NATIVE = BINARY_OTHER
 
-BINARY_NATIVE = BINARY_UNIX64
-BINARY_NATIVE = BINARY_WIN32
-BINARY_NATIVE = BINARY_WIN64
-BINARY_NATIVE = BINARY_OTHER
-
 ICON_STATE_NULL = 0
 ICON_STATE_WAIT = 1
 ICON_STATE_OFF  = 2