discovery should not link to juce-audio-basics; Misc changes

source/discovery/Makefile

@@ -11,7 +11,7 @@ include $(CWD)/Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils -isystem ../modules
-BUILD_CXX_FLAGS += -I../includes/ladspa -I../includes/vst
+BUILD_CXX_FLAGS += -I../includes/vst
 ifeq ($(MACOS_OR_WIN32),true)
 BUILD_CXX_FLAGS += -I../includes/vst3
 endif
@@ -47,20 +47,19 @@ LIBS_win32    = ../modules/lilv.win32.a
 LIBS_win64    = ../modules/lilv.win64.a
 LINK_FLAGS    = $(LILV_LIBS)
 
-LIBS         += ../modules/juce_audio_basics.a
-LIBS_posix32 += ../modules/juce_audio_basics.posix32.a
-LIBS_posix64 += ../modules/juce_audio_basics.posix64.a
-LIBS_win32   += ../modules/juce_audio_basics.win32.a
-LIBS_win64   += ../modules/juce_audio_basics.win64.a
 LIBS         += ../modules/juce_core.a
 LIBS_posix32 += ../modules/juce_core.posix32.a
 LIBS_posix64 += ../modules/juce_core.posix64.a
 LIBS_win32   += ../modules/juce_core.win32.a
 LIBS_win64   += ../modules/juce_core.win64.a
-LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
 LINK_FLAGS   += $(JUCE_CORE_LIBS)
 
 ifeq ($(MACOS_OR_WIN32),true)
+LIBS         += ../modules/juce_audio_basics.a
+LIBS_posix32 += ../modules/juce_audio_basics.posix32.a
+LIBS_posix64 += ../modules/juce_audio_basics.posix64.a
+LIBS_win32   += ../modules/juce_audio_basics.win32.a
+LIBS_win64   += ../modules/juce_audio_basics.win64.a
 LIBS         += ../modules/juce_audio_processors.a
 LIBS_posix32 += ../modules/juce_audio_processors.posix32.a
 LIBS_posix64 += ../modules/juce_audio_processors.posix64.a
@@ -91,6 +90,7 @@ LIBS         += ../modules/juce_gui_extra.a
 LIBS_posix32 += ../modules/juce_gui_extra.posix32.a
 LIBS_posix64 += ../modules/juce_gui_extra.posix64.a
 endif
+LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
 LINK_FLAGS   += $(JUCE_AUDIO_PROCESSORS_LIBS)
 LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS   += $(JUCE_EVENTS_LIBS)

source/discovery/carla-discovery.cpp

@@ -45,9 +45,8 @@
 
 #include <iostream>
 
-#include "juce_audio_basics.h"
+#include "juce_core.h"
 using juce::File;
-using juce::FloatVectorOperations;
 using juce::String;
 using juce::StringArray;
 
@@ -200,7 +199,7 @@ static intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t
         break;
 
     case DECLARE_VST_DEPRECATED(audioMasterGetNumAutomatableParameters):
-        ret = carla_fixValue<intptr_t>(0, MAX_DEFAULT_PARAMETERS, effect->numParams);
+        ret = carla_minPositive(effect->numParams, static_cast<int>(MAX_DEFAULT_PARAMETERS));
         break;
 
     case DECLARE_VST_DEPRECATED(audioMasterGetParameterQuantization):
@@ -550,7 +549,7 @@ static void do_ladspa_check(void*& libHandle, const char* const filename, const
 
                 if (LADSPA_IS_PORT_AUDIO(portDescriptor))
                 {
-                    FloatVectorOperations::clear(bufferAudio[iA], kBufferSize);
+                    carla_zeroFloat(bufferAudio[iA], kBufferSize);
                     descriptor->connect_port(handle, j, bufferAudio[iA++]);
                 }
                 else if (LADSPA_IS_PORT_CONTROL(portDescriptor))
@@ -816,7 +815,7 @@ static void do_dssi_check(void*& libHandle, const char* const filename, const bo
 
                 if (LADSPA_IS_PORT_AUDIO(portDescriptor))
                 {
-                    FloatVectorOperations::clear(bufferAudio[iA], kBufferSize);
+                    carla_zeroFloat(bufferAudio[iA], kBufferSize);
                     ldescriptor->connect_port(handle, j, bufferAudio[iA++]);
                 }
                 else if (LADSPA_IS_PORT_CONTROL(portDescriptor))
@@ -1266,14 +1265,14 @@ static void do_vst_check(void*& libHandle, const bool doInit)
             for (int j=0; j < audioIns; ++j)
             {
                 bufferAudioIn[j] = new float[kBufferSize];
-                FloatVectorOperations::clear(bufferAudioIn[j], kBufferSize);
+                carla_zeroFloat(bufferAudioIn[j], kBufferSize);
             }
 
             float* bufferAudioOut[audioOuts];
             for (int j=0; j < audioOuts; ++j)
             {
                 bufferAudioOut[j] = new float[kBufferSize];
-                FloatVectorOperations::clear(bufferAudioOut[j], kBufferSize);
+                carla_zeroFloat(bufferAudioOut[j], kBufferSize);
             }
 
             struct VstEventsFixed {

source/discovery/carla-discovery.pro

@@ -1,57 +1,71 @@
 # QtCreator project file
 
-QT = core
-
 TARGET   = carla-discovery-qtcreator
 TEMPLATE = app
-VERSION  = 0.5.0
+VERSION  = 1.9
 
 # -------------------------------------------------------
 
-CONFIG     = debug
-CONFIG    += link_pkgconfig qt shared warn_on
+CONFIG  = debug
+CONFIG += link_pkgconfig warn_on
+
+# -------------------------------------------------------
 
-DEFINES    = DEBUG
-DEFINES   += QTCREATOR_TEST
+DEFINES  = DEBUG REAL_BUILD
+DEFINES += QTCREATOR_TEST
 
-DEFINES   += WANT_LADSPA
-DEFINES   += WANT_DSSI
-DEFINES   += WANT_LV2
-DEFINES   += WANT_VST
-DEFINES   += WANT_FLUIDSYNTH
-DEFINES   += WANT_LINUXSAMPLER
+DEFINES += HAVE_FLUIDSYNTH
+DEFINES += HAVE_LINUXSAMPLER
+DEFINES += HAVE_X11
+DEFINES += VESTIGE_HEADER
+DEFINES += WANT_ZYNADDSUBFX
+DEFINES += WANT_ZYNADDSUBFX_UI
+
+# -------------------------------------------------------
 
 PKGCONFIG  = fluidsynth
 PKGCONFIG += linuxsampler
 
-SOURCES = \
-    carla-discovery.cpp
+# -------------------------------------------------------
+
+LIBS  = ../modules/juce_core.a
+LIBS += ../modules/lilv.a
+LIBS += -ldl
 
 # -------------------------------------------------------
 
+SOURCES = \
+    carla-discovery.cpp
+
 HEADERS  = \
     ../backend/CarlaBackend.hpp
 
 HEADERS += \
     ../includes/CarlaDefines.hpp \
-    ../includes/CarlaMIDI.h \
-    ../includes/ladspa_rdf.hpp \
-    ../includes/lv2_rdf.hpp \
+    ../includes/CarlaMIDI.h
+
+HEADERS += \
+    ../modules/ladspa_rdf.hpp \
+    ../modules/lv2_rdf.hpp
+
+HEADERS += \
     ../utils/CarlaUtils.hpp \
-    ../utils/CarlaBase64Utils.hpp \
-    ../utils/CarlaJuceUtils.hpp \
+    ../utils/CarlaBackendUtils.hpp \
     ../utils/CarlaLibUtils.hpp \
+    ../utils/CarlaMathUtils.hpp \
     ../utils/CarlaLadspaUtils.hpp \
+    ../utils/CarlaDssiUtils.hpp \
     ../utils/CarlaLv2Utils.hpp \
-    ../utils/CarlaVstUtils.hpp \
-    ../utils/CarlaString.hpp
+    ../utils/CarlaVstUtils.hpp
 
 INCLUDEPATH = \
     ../backend \
     ../includes \
+    ../modules \
     ../utils
 
-LIBS  = -ldl
-LIBS += ../libs/lilv.a
+# -------------------------------------------------------
+
+QMAKE_CXXFLAGS *= -std=c++11
 
-QMAKE_CXXFLAGS *= -std=c++0x
+# -------------------------------------------------------

source/utils/CarlaMathUtils.hpp

@@ -150,7 +150,6 @@ bool carla_isNotZero(const T& value)
     return std::abs(value) >= std::numeric_limits<T>::epsilon();
 }
 
-#if 0
 // -----------------------------------------------------------------------
 // math functions (extended)
 
@@ -192,7 +191,6 @@ void carla_zeroFloat(float* const data, const std::size_t numSamples) noexcept
 
     std::memset(data, 0, numSamples*sizeof(float));
 }
-#endif
 
 #if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC)
 // -----------------------------------------------------------------------