Fix ntk syntax test

c++/carla-backend/Makefile

@@ -23,7 +23,7 @@ HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true)
 endif
 
 HAVE_ZYN_DEPS     = $(shell pkg-config --exists fftw3 mxml && echo true)
-HAVE_ZYN_GUI_DEPS = $(shell pkg-config --exists ntk && echo true)
+HAVE_ZYN_GUI_DEPS = $(shell which ntk-config)
 
 # --------------------------------------------------------------
 
@@ -61,22 +61,17 @@ endif
 ifeq ($(HAVE_ZYN_DEPS),true)
 LINK_FLAGS       += $(shell pkg-config --libs fftw3 mxml)
 
-ifeq ($(HAVE_ZYN_GUI_DEPS),true)
-LINK_FLAGS       += $(shell pkg-config --libs ntk)
+ifneq ($(HAVE_ZYN_GUI_DEPS),)
+LINK_FLAGS       += $(shell ntk-config --ldflags)
 endif
 endif
 
 OBJS = \
 	carla_backend_standalone.o \
 
-OBJS += \
-	../carla-engine/carla_engine.a \
-	../carla-native/carla_native.a \
-	../carla-plugin/carla_plugin.a
-
-# FIXME!!
-OBJS += \
-	../carla-native/*.o
+OBJS += ../carla-engine/carla_engine.a
+OBJS += ../carla-plugin/carla_plugin.a
+OBJS += ../carla-native/carla_native.a
 
 # others
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
@@ -92,6 +87,7 @@ doc: carla_backend.doxygen
 	doxygen $<
 
 carla_backend.so: $(OBJS)
+	echo $(LINK_FLAGS)
 	$(CXX) $^ $(LINK_FLAGS) -o $@ && $(STRIP) $@
 
 # --------------------------------------------------------------

c++/carla-backend/carla-backend.pro

@@ -13,7 +13,7 @@ PKGCONFIG += jack
 PKGCONFIG += alsa libpulse-simple
 PKGCONFIG += suil-0
 PKGCONFIG += fluidsynth linuxsampler
-PKGCONFIG += fftw3 mxml ntk
+PKGCONFIG += fftw3 mxml
 
 TARGET   = carla_backend
 TEMPLATE = app # lib
@@ -34,15 +34,20 @@ INCLUDEPATH = . \
 
 LIBS = \
     ../carla-engine/carla_engine.a \
-    ../carla-native/carla_native.a \
-    ../carla-plugin/carla_plugin.a
+    ../carla-plugin/carla_plugin.a \
+    ../carla-native/carla_native.a
 
-LIBS = \
+LIBS += \
     ../carla-lilv/carla_lilv.a \
     ../carla-rtmempool/carla_rtmempool.a
 
 QMAKE_CXXFLAGS *= -std=c++0x
 
+# NTK
+QMAKE_CXXFLAGS *= `ntk-config --cxxflags`
+QMAKE_LFLAGS *= `ntk-config --ldflags`
+LIBS += `ntk-config --libs`
+
 unix {
 LIBS += -ldl -lm
 }

c++/carla-backend/carla_backend.doxygen

@@ -8,7 +8,7 @@ PROJECT_NAME           = "Carla Backend"
 PROJECT_NUMBER         =
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = doxygen
+OUTPUT_DIRECTORY       = ../../doc/carla-backend
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -99,7 +99,7 @@ INPUT                  =
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
-EXCLUDE                =
+EXCLUDE                = carla_backend_standalone.cpp
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        =
@@ -132,7 +132,7 @@ IGNORE_PREFIX          =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html
+HTML_OUTPUT            = .
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            =
@@ -241,7 +241,7 @@ EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = DOXYGEN CARLA_ENGINE_JACK CARLA_ENGINE_RTAUDIO WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST WANT_FLUIDSYNTH WANT_LINUXSAMPLER
+PREDEFINED             = DOXYGEN
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

c++/carla-backend/carla_backend_standalone.hpp

@@ -22,6 +22,8 @@
 
 #include "carla_backend.hpp"
 
+CARLA_BACKEND_USE_NAMESPACE
+
 /*!
  * @defgroup CarlaBackendStandalone Carla Backend Standalone
  *
@@ -31,8 +33,8 @@
  */
 
 struct PluginInfo {
-    CarlaBackend::PluginType type;
-    CarlaBackend::PluginCategory category;
+    PluginType type;
+    PluginCategory category;
     unsigned int hints;
     const char* binary;
     const char* name;
@@ -42,8 +44,8 @@ struct PluginInfo {
     long uniqueId;
 
     PluginInfo()
-        : type(CarlaBackend::PLUGIN_NONE),
-          category(CarlaBackend::PLUGIN_CATEGORY_NONE),
+        : type(PLUGIN_NONE),
+          category(PLUGIN_CATEGORY_NONE),
           hints(0x0),
           binary(nullptr),
           name(nullptr),
@@ -87,11 +89,11 @@ struct ScalePointInfo {
 };
 
 struct GuiInfo {
-    CarlaBackend::GuiType type;
+    GuiType type;
     bool resizable;
 
     GuiInfo()
-        : type(CarlaBackend::GUI_NONE),
+        : type(GUI_NONE),
           resizable(false) {}
 };
 
@@ -107,7 +109,7 @@ CARLA_EXPORT bool engine_init(const char* driver_name, const char* client_name);
 CARLA_EXPORT bool engine_close();
 CARLA_EXPORT bool is_engine_running();
 
-CARLA_EXPORT short add_plugin(CarlaBackend::BinaryType btype, CarlaBackend::PluginType ptype, const char* filename, const char* name, const char* label, void* extra_stuff);
+CARLA_EXPORT short add_plugin(BinaryType btype, PluginType ptype, const char* filename, const char* name, const char* label, void* extra_stuff);
 CARLA_EXPORT bool  remove_plugin(unsigned short plugin_id);
 
 CARLA_EXPORT const PluginInfo* get_plugin_info(unsigned short plugin_id);
@@ -118,10 +120,10 @@ CARLA_EXPORT const ParameterInfo* get_parameter_info(unsigned short plugin_id, u
 CARLA_EXPORT const ScalePointInfo* get_parameter_scalepoint_info(unsigned short plugin_id, uint32_t parameter_id, uint32_t scalepoint_id);
 CARLA_EXPORT const GuiInfo* get_gui_info(unsigned short plugin_id);
 
-CARLA_EXPORT const CarlaBackend::ParameterData* get_parameter_data(unsigned short plugin_id, uint32_t parameter_id);
-CARLA_EXPORT const CarlaBackend::ParameterRanges* get_parameter_ranges(unsigned short plugin_id, uint32_t parameter_id);
-CARLA_EXPORT const CarlaBackend::MidiProgramData* get_midi_program_data(unsigned short plugin_id, uint32_t midi_program_id);
-CARLA_EXPORT const CarlaBackend::CustomData* get_custom_data(unsigned short plugin_id, uint32_t custom_data_id);
+CARLA_EXPORT const ParameterData* get_parameter_data(unsigned short plugin_id, uint32_t parameter_id);
+CARLA_EXPORT const ParameterRanges* get_parameter_ranges(unsigned short plugin_id, uint32_t parameter_id);
+CARLA_EXPORT const MidiProgramData* get_midi_program_data(unsigned short plugin_id, uint32_t midi_program_id);
+CARLA_EXPORT const CustomData* get_custom_data(unsigned short plugin_id, uint32_t custom_data_id);
 CARLA_EXPORT const char* get_chunk_data(unsigned short plugin_id);
 
 CARLA_EXPORT uint32_t get_parameter_count(unsigned short plugin_id);
@@ -155,7 +157,7 @@ CARLA_EXPORT void set_parameter_midi_cc(unsigned short plugin_id, uint32_t param
 CARLA_EXPORT void set_program(unsigned short plugin_id, uint32_t program_id);
 CARLA_EXPORT void set_midi_program(unsigned short plugin_id, uint32_t midi_program_id);
 
-CARLA_EXPORT void set_custom_data(unsigned short plugin_id, CarlaBackend::CustomDataType dtype, const char* key, const char* value);
+CARLA_EXPORT void set_custom_data(unsigned short plugin_id, CustomDataType dtype, const char* key, const char* value);
 CARLA_EXPORT void set_chunk_data(unsigned short plugin_id, const char* chunk_data);
 CARLA_EXPORT void set_gui_container(unsigned short plugin_id, uintptr_t gui_addr);
 
@@ -171,8 +173,8 @@ CARLA_EXPORT double   get_sample_rate();
 CARLA_EXPORT const char* get_last_error();
 CARLA_EXPORT const char* get_host_osc_url();
 
-CARLA_EXPORT void set_callback_function(CarlaBackend::CallbackFunc func);
-CARLA_EXPORT void set_option(CarlaBackend::OptionsType option, int value, const char* value_str);
+CARLA_EXPORT void set_callback_function(CallbackFunc func);
+CARLA_EXPORT void set_option(OptionsType option, int value, const char* value_str);
 
 CARLA_EXPORT void nsm_announce(const char* url, int pid);
 CARLA_EXPORT void nsm_reply_open();

c++/carla-native/Makefile

@@ -7,7 +7,7 @@
 include ../Makefile.mk
 
 HAVE_ZYN_DEPS     = $(shell pkg-config --exists fftw3 mxml && echo true)
-HAVE_ZYN_GUI_DEPS = $(shell pkg-config --exists ntk && echo true)
+HAVE_ZYN_GUI_DEPS = $(shell which ntk-config)
 
 # --------------------------------------------------------------
 
@@ -18,8 +18,8 @@ BUILD_CXX_FLAGS  += $(shell pkg-config --cflags QtCore)
 ifeq ($(HAVE_ZYN_DEPS),true)
 BUILD_CXX_FLAGS  += $(shell pkg-config --cflags fftw3 mxml) -DWANT_ZYNADDSUBFX
 
-ifeq ($(HAVE_ZYN_GUI_DEPS),true)
-BUILD_CXX_FLAGS  += $(shell pkg-config --cflags ntk) -DWANT_ZYNADDSUBFX_GUI
+ifneq ($(HAVE_ZYN_GUI_DEPS))
+BUILD_CXX_FLAGS  += $(shell ntk-config --cxxflags) -DWANT_ZYNADDSUBFX_GUI
 endif
 endif
 

c++/carla-native/carla_native.pro

@@ -11,7 +11,7 @@ DEFINES  += QTCREATOR_TEST
 
 DEFINES  += WANT_ZYNADDSUBFX WANT_ZYNADDSUBFX_GUI
 
-PKGCONFIG = fftw3 mxml ntk
+PKGCONFIG = fftw3 mxml
 
 TARGET   = carla_native
 TEMPLATE = lib
@@ -33,3 +33,4 @@ INCLUDEPATH = . \
 
 QMAKE_CFLAGS   *= -std=c99
 QMAKE_CXXFLAGS *= -std=c++0x
+QMAKE_CXXFLAGS *= `ntk-config --cxxflags`