Continue rework, rename some files

Makefile

@@ -173,7 +173,8 @@ src/resources_rc.py: resources/resources.qrc
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-CPP: carla-backend carla-bridge carla-discovery jackmeter xycontroller
+# CPP: carla-backend carla-bridge carla-discovery
+CPP: carla-discovery jackmeter xycontroller
 
 carla-backend: carla-lilv carla-rtmempool
 	$(MAKE) -C c++/carla-backend
@@ -199,11 +200,7 @@ xycontroller:
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
 debug:
-	$(MAKE) -f Makefile.dbg -C c++/carla-backend
-	$(MAKE) -f Makefile.dbg -C c++/carla-bridge
-	$(MAKE) -f Makefile.dbg -C c++/carla-discovery NATIVE=1
-	$(MAKE) -f Makefile.dbg -C c++/jackmeter
-	$(MAKE) -f Makefile.dbg -C c++/xycontroller
+	$(MAKE) DEBUG=true
 
 doc:
 	$(MAKE) doc -C c++/carla-backend

c++/Makefile.mk

@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+# Makefile for Cadence C++ code #
+# ------------------------------------ #
+# Created by falkTX
+#
+
+AR  ?= ar
+CC  ?= gcc
+CXX ?= g++
+MOC ?= moc
+RCC ?= rcc
+UIC ?= uic
+STRIP ?= strip
+WINDRES ?= windres
+
+DEBUG ?= false
+
+ifeq ($(DEBUG),true)
+BASE_FLAGS  = -O0 -g -Wall
+BASE_FLAGS += -DDEBUG
+STRIP       = true # FIXME
+else
+BASE_FLAGS  = -O2 -ffast-math -mtune=generic -msse -mfpmath=sse -Wall
+BASE_FLAGS += -DNDEBUG
+endif
+
+32BIT_FLAGS = -m32
+64BIT_FLAGS = -m64
+
+BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 $(CFLAGS)
+BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
+LINK_FLAGS      = $(LDFLAGS)
+
+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
+BUILD_CXX_FLAGS += -DVESTIGE_HEADER
+
+# Modify to enable/disable features
+CARLA_PLUGIN_SUPPORT   = true
+CARLA_SAMPLERS_SUPPORT = true
+CARLA_RTAUDIO_SUPPORT  = false

c++/carla-backend/carla_backend.hpp

@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#ifndef CARLA_BACKEND_H
-#define CARLA_BACKEND_H
+#ifndef CARLA_BACKEND_HPP
+#define CARLA_BACKEND_HPP
 
 #include <cstdint>
 
@@ -166,7 +166,7 @@ enum InternalParametersIndex {
 /*!
  * Custom Data types.\n
  * The type defines how the value in CustomData is stored.\n
- * Binary chunks are stored in base64 format.
+ * Binary/chunks are stored in a base64 format string.
  */
 enum CustomDataType {
     CUSTOM_DATA_INVALID = 0, //!< Null/Invalid data.
@@ -586,10 +586,6 @@ struct CustomData {
 
 /**@}*/
 
-class CarlaEngine;
-class CarlaPlugin;
-class CarlaOsc;
-
 CARLA_BACKEND_END_NAMESPACE
 
-#endif // CARLA_BACKEND_H
+#endif // CARLA_BACKEND_HPP

c++/carla-discovery/Makefile

@@ -4,41 +4,36 @@
 # Created by falkTX
 #
 
-CXX   ?= g++
-STRIP ?= strip
+include ../Makefile.mk
 
-BASE_FLAGS   = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse -Wall
-BASE_FLAGS  += -I../carla-backend -I../carla-includes
+BUILD_CXX_FLAGS += -I../carla-backend -I../carla-includes -I../carla-utils
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore)
 
-BUILD_FLAGS  = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
-BUILD_FLAGS += $(shell pkg-config --cflags QtCore)
-BUILD_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT # -DNDEBUG
-BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header
-
-32BIT_FLAGS  = -m32
-64BIT_FLAGS  = -m64
-LINK_FLAGS   = $(shell pkg-config --libs QtCore) $(LDFLAGS)
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
+endif
 
+ifeq ($(CARLA_SAMPLERS_SUPPORT),true)
 ifneq ($(NATIVE),)
-BUILD_FLAGS += -DBUILD_NATIVE
-
 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)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags fluidsynth) -DWANT_FLUIDSYNTH
+LINK_FLAGS      += $(shell pkg-config --libs fluidsynth)
 endif
 
 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
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags linuxsampler) -DWANT_LINUXSAMPLER
+LINK_FLAGS      += $(shell pkg-config --libs linuxsampler)
 endif
+endif # NATIVE
+endif # CARLA_SAMPLERS_SUPPORT
 
-POSIX_BUILD_FLAGS = $(BUILD_FLAGS)
+POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
 POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
 POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
 POSIX_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lpthread
 
-WIN_BUILD_FLAGS   = $(BUILD_FLAGS)
+WIN_BUILD_FLAGS   = $(BUILD_CXX_FLAGS)
 WIN_32BIT_FLAGS   = $(32BIT_FLAGS)
 WIN_64BIT_FLAGS   = $(64BIT_FLAGS)
 WIN_LINK_FLAGS    = $(LINK_FLAGS) -static -mwindows

c++/carla-discovery/Makefile.dbg

@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for carla-discovery #
-# ----------------------------------------- #
-# Created by falkTX
-#
-
-CXX ?= g++
-
-BASE_FLAGS   = -O0 -g -Wall
-BASE_FLAGS  += -I../carla-backend -I../carla-includes
-
-BUILD_FLAGS  = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
-BUILD_FLAGS += $(shell pkg-config --cflags QtCore)
-BUILD_FLAGS += -DDEBUG
-BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header
-
-32BIT_FLAGS  = -m32
-64BIT_FLAGS  = -m64
-LINK_FLAGS   = $(shell pkg-config --libs QtCore) $(LDFLAGS)
-
-ifneq ($(NATIVE),)
-BUILD_FLAGS += -DBUILD_NATIVE
-
-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 ($(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
-endif
-
-POSIX_BUILD_FLAGS = $(BUILD_FLAGS)
-POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
-POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
-POSIX_LINK_FLAGS  = $(LINK_FLAGS) -ldl
-
-WIN_BUILD_FLAGS   = $(BUILD_FLAGS)
-WIN_32BIT_FLAGS   = $(32BIT_FLAGS)
-WIN_64BIT_FLAGS   = $(64BIT_FLAGS)
-WIN_LINK_FLAGS    = $(LINK_FLAGS) -static -mwindows
-
-# --------------------------------------------------------------
-
-all: carla-discovery-native
-
-posix32: carla-discovery-posix32
-posix64: carla-discovery-posix64
-win32:   carla-discovery-win32.exe
-win64:   carla-discovery-win64.exe
-
-# --------------------------------------------------------------
-
-OBJS = carla-discovery.cpp
-
-carla-discovery-native: carla-discovery.cpp ../carla-lilv/carla_lilv.a
-	$(CXX) $^ $(BUILD_FLAGS) $(LINK_FLAGS) -o $@
-
-carla-discovery-posix32: $(OBJS) ../carla-lilv/carla_lilv_posix32.a
-	$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@
-
-carla-discovery-posix64: $(OBJS) ../carla-lilv/carla_lilv_posix64.a
-	$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@
-
-carla-discovery-win32.exe: $(OBJS) ../carla-lilv/carla_lilv_win32.a
-	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@
-
-carla-discovery-win64.exe: $(OBJS) ../carla-lilv/carla_lilv_win64.a
-	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@
-
-../carla-lilv/carla_lilv.a:
-	$(MAKE) -C ../carla-lilv
-
-../carla-lilv/carla_lilv_posix32.a:
-	$(MAKE) -C ../carla-lilv posix32
-
-../carla-lilv/carla_lilv_posix64.a:
-	$(MAKE) -C ../carla-lilv posix64
-
-../carla-lilv/carla_lilv_win32.a:
-	$(MAKE) -C ../carla-lilv win32
-
-../carla-lilv/carla_lilv_win64.a:
-	$(MAKE) -C ../carla-lilv win64
-
-# --------------------------------------------------------------
-
-clean:
-	rm -f carla-discovery-*

c++/carla-discovery/carla-discovery.cpp

@@ -15,37 +15,37 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "carla_includes.h"
-#include "carla_lib_includes.h"
-
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
 #include <iostream>
-
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QUrl>
 
-#include "carla_backend.h"
-
-#include "carla_ladspa.h"
-#include "carla_dssi.h"
-#include "carla_lv2.h"
-#include "carla_vst.h"
+#include "carla_backend.hpp"
+#include "carla_lib_utils.hpp"
 
-#ifdef BUILD_NATIVE
- #ifdef WANT_FLUIDSYNTH
-  #include "carla_fluidsynth.h"
- #endif
- #ifdef WANT_LINUXSAMPLER
-  #include "carla_linuxsampler.h"
- #endif
+#ifdef WANT_LADSPA
+# include "carla_ladspa_utils.hpp"
+#endif
+#ifdef WANT_DSSI
+# include "carla_ladspa_utils.hpp"
+# include "dssi/dssi.h"
+#endif
+#ifdef WANT_LV2
+# include "carla_lv2_utils.hpp"
+#endif
+#ifdef WANT_VST
+# include "carla_vst_utils.hpp"
+#endif
+#ifdef WANT_FLUIDSYNTH
+# include <fluidsynth.h>
+#endif
+#ifdef WANT_LINUXSAMPLER
+# include "linuxsampler/EngineFactory.h"
 #endif
 
 #define DISCOVERY_OUT(x, y) std::cout << "\ncarla-discovery::" << x << "::" << y << std::endl;
 
-// fake values to test plugins with
+// Fake values to test plugins with
 const uint32_t bufferSize = 512;
 const double   sampleRate = 44100.0;
 
@@ -61,6 +61,7 @@ using namespace CarlaBackend;
 
 // ------------------------------ VST Stuff ------------------------------
 
+#ifdef WANT_VST
 intptr_t vstCurrentUniqueId = 0;
 
 intptr_t vstHostCanDo(const char* const feature)
@@ -202,11 +203,13 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode
 
     return ret;
 }
+#endif
 
 // ------------------------------ Plugin Checks -----------------------------
 
 void do_ladspa_check(void* const libHandle, const bool init)
 {
+#ifdef WANT_LADSPA
     const LADSPA_Descriptor_Function descFn = (LADSPA_Descriptor_Function)lib_symbol(libHandle, "ladspa_descriptor");
 
     if (! descFn)
@@ -367,10 +370,16 @@ void do_ladspa_check(void* const libHandle, const bool init)
         DISCOVERY_OUT("build", BINARY_NATIVE);
         DISCOVERY_OUT("end", "------------");
     }
+#else
+    DISCOVERY_OUT("error", "LADSPA support not available");
+    Q_UNUSED(libHandle);
+    Q_UNUSED(init);
+#endif
 }
 
 void do_dssi_check(void* const libHandle, const bool init)
 {
+#ifdef WANT_DSSI
     const DSSI_Descriptor_Function descFn = (DSSI_Descriptor_Function)lib_symbol(libHandle, "dssi_descriptor");
 
     if (! descFn)
@@ -579,21 +588,27 @@ void do_dssi_check(void* const libHandle, const bool init)
         DISCOVERY_OUT("build", BINARY_NATIVE);
         DISCOVERY_OUT("end", "------------");
     }
+#else
+    DISCOVERY_OUT("error", "DSSI support not available");
+    Q_UNUSED(libHandle);
+    Q_UNUSED(init);
+#endif
 }
 
 void do_lv2_check(const char* const bundle, const bool init)
 {
+#ifdef WANT_LV2
     // Convert bundle filename to URI
     QString qBundle(QUrl::fromLocalFile(bundle).toString());
     if (! qBundle.endsWith(QDir::separator()))
         qBundle += QDir::separator();
 
     // Load bundle
-    Lilv::Node lilvBundle(Lv2World.new_uri(qBundle.toUtf8().constData()));
-    Lv2World.load_bundle(lilvBundle);
+    Lilv::Node lilvBundle(lv2World.new_uri(qBundle.toUtf8().constData()));
+    lv2World.load_bundle(lilvBundle);
 
     // Load plugins in this bundle
-    const Lilv::Plugins lilvPlugins = Lv2World.get_all_plugins();
+    const Lilv::Plugins lilvPlugins = lv2World.get_all_plugins();
 
     // Get all plugin URIs in this bundle
     QStringList URIs;
@@ -732,10 +747,16 @@ void do_lv2_check(const char* const bundle, const bool init)
         DISCOVERY_OUT("build", BINARY_NATIVE);
         DISCOVERY_OUT("end", "------------");
     }
+#else
+    DISCOVERY_OUT("error", "LV2 support not available");
+    Q_UNUSED(bundle);
+    Q_UNUSED(init);
+#endif
 }
 
 void do_vst_check(void* const libHandle, const bool init)
 {
+#ifdef WANT_VST
     VST_Function vstFn = (VST_Function)lib_symbol(libHandle, "VSTPluginMain");
 
     if (! vstFn)
@@ -920,6 +941,11 @@ void do_vst_check(void* const libHandle, const bool init)
     free((void*)cName);
     free((void*)cProduct);
     free((void*)cVendor);
+#else
+    DISCOVERY_OUT("error", "VST support not available");
+    Q_UNUSED(libHandle);
+    Q_UNUSED(init);
+#endif
 }
 
 void do_fluidsynth_check(const char* const filename, const bool init)
@@ -1095,7 +1121,6 @@ void do_linuxsampler_check(const char* const filename, const char* const stype,
         const LinuxSamplerScopedEngine engine(filename, stype);
     else
         LinuxSamplerScopedEngine::outputInfo(nullptr, 0, file.baseName().toUtf8().constData());
-
 #else
     DISCOVERY_OUT("error", stype << " support not available");
     Q_UNUSED(filename);
@@ -1107,6 +1132,57 @@ void do_linuxsampler_check(const char* const filename, const char* const stype,
 
 int main(int argc, char* argv[])
 {
+    if (argc == 2 && strcmp(argv[1], "-formats") == 0)
+    {
+        printf("Available plugin formats:\n");
+        printf("LADSPA: ");
+#ifdef WANT_LADSPA
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        printf("DSSI:   ");
+#ifdef WANT_DSSI
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        printf("LV2:    ");
+#ifdef WANT_LV2
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        printf("VST:    ");
+#ifdef WANT_VST
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        printf("\n");
+
+        printf("Available sampler formats:\n");
+        printf("GIG (LinuxSampler): ");
+#ifdef WANT_LINUXSAMPLER
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        printf("SF2 (FluidSynth):   ");
+#ifdef WANT_FLUIDSYNTH
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        printf("SFZ (LinuxSampler): ");
+#ifdef WANT_LINUXSAMPLER
+        printf("yes\n");
+#else
+        printf("no\n");
+#endif
+        return 0;
+    }
+
     if (argc != 3)
     {
         qWarning("usage: %s <type> </path/to/plugin>", argv[0]);

c++/carla-discovery/carla-discovery.pro

@@ -0,0 +1,45 @@
+# QtCreator project file
+
+QT = core
+
+CONFIG    = debug
+CONFIG   += link_pkgconfig qt warn_on
+
+DEFINES   = DEBUG
+DEFINES  += BUILD_NATIVE
+DEFINES  += WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST
+DEFINES  += WANT_FLUIDSYNTH WANT_LINUXSAMPLER
+PKGCONFIG = fluidsynth linuxsampler
+
+TARGET   = carla-discovery-qtcreator
+TEMPLATE = app
+VERSION  = 0.5.0
+
+SOURCES = \
+    carla-discovery.cpp
+
+HEADERS = \
+    ../carla-includes/carla_defines.hpp \
+    ../carla-includes/ladspa_rdf.hpp \
+    ../carla-includes/lv2_rdf.hpp \
+    ../carla-utils/carla_lib_utils.hpp \
+    ../carla-utils/carla_ladspa_utils.hpp \
+    ../carla-utils/carla_lv2_utils.hpp \
+    ../carla-utils/carla_vst_utils.hpp
+
+INCLUDEPATH = .. \
+    ../carla-backend \
+    ../carla-includes \
+    ../carla-utils
+
+LIBS = \
+    ../carla-lilv/carla_lilv.a
+
+unix {
+LIBS += -ldl -lpthread
+}
+win {
+LIBS += -static -mwindows
+}
+
+QMAKE_CXXFLAGS *= -std=c++0x

c++/carla-discovery/qtcreator/carla-discovery.pro

@@ -1,44 +0,0 @@
-# QtCreator project file
-
-QT = core
-
-CONFIG    = debug
-CONFIG    = release static
-CONFIG   += link_pkgconfig qt warn_on
-
-DEFINES   = DEBUG BUILD_NATIVE
-DEFINES  += WANT_FLUIDSYNTH WANT_LINUXSAMPLER
-PKGCONFIG = fluidsynth linuxsampler
-
-TARGET   = carla-discovery-qtcreator
-TEMPLATE = app
-VERSION  = 0.5.0
-
-SOURCES = \
-    ../carla-discovery.cpp
-
-HEADERS = \
-    ../../carla-includes/carla_includes.h \
-    ../../carla-includes/carla_lib_includes.h \
-    ../../carla-includes/carla_ladspa.h \
-    ../../carla-includes/carla_dssi.h \
-    ../../carla-includes/carla_lv2.h \
-    ../../carla-includes/carla_vst.h \
-    ../../carla-includes/carla_fluidsynth.h \
-    ../../carla-includes/carla_linuxsampler.h \
-    ../../carla-includes/ladspa_rdf.h \
-    ../../carla-includes/lv2_rdf.h
-
-INCLUDEPATH = .. \
-    ../../carla-backend \
-    ../../carla-includes
-
-LIBS = \
-    ../../carla-lilv/carla_lilv.a
-
-QMAKE_CXXFLAGS *= -std=c++0x
-
-win {
-    LIBS += -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 -lqtmain
-    QMAKE_LFLAGS *= -static -static-libgcc
-}