Don't use juce for vst discovery yet

source/discovery/Makefile

@@ -24,43 +24,38 @@ BUILD_CXX_FLAGS += -DWANT_NATIVE
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
-ifeq ($(CARLA_VESTIGE_HEADER),true) # TODO: and not have juce
+ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 endif
 endif
 
 # --------------------------------------------------------------
 
-# ifeq ($(HAVE_CSOUND),true)
-# NATIVE_FLAGS += $(shell pkg-config --cflags --libs sndfile) -lcsound64 -DWANT_CSOUND
-# endif
-#
-# ifeq ($(HAVE_FLUIDSYNTH),true)
-# NATIVE_FLAGS += $(shell pkg-config --cflags --libs fluidsynth) -DWANT_FLUIDSYNTH
-# endif
-#
-# ifeq ($(HAVE_LINUXSAMPLER),true)
-# NATIVE_FLAGS += $(shell pkg-config --cflags --libs linuxsampler) -DWANT_LINUXSAMPLER
-# endif
+ifeq ($(HAVE_CSOUND),true)
+NATIVE_FLAGS += $(shell pkg-config --cflags --libs sndfile) -lcsound64 -DWANT_CSOUND
+endif
+
+ifeq ($(HAVE_FLUIDSYNTH),true)
+NATIVE_FLAGS += $(shell pkg-config --cflags --libs fluidsynth) -DWANT_FLUIDSYNTH
+endif
+
+ifeq ($(HAVE_LINUXSAMPLER),true)
+NATIVE_FLAGS += $(shell pkg-config --cflags --libs linuxsampler) -DWANT_LINUXSAMPLER
+endif
 
 # --------------------------------------------------------------
 
 ifeq ($(HAVE_JUCE),true)
-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
 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
-# LIBS_win32   += ../modules/juce_audio_processors.win32.a
-# LIBS_win64   += ../modules/juce_audio_processors.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
 endif
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)

source/discovery/carla-discovery.cpp

@@ -22,7 +22,8 @@
 
 #ifdef HAVE_JUCE
 # define JUCE_PLUGIN_HOST_NO_UI
-# undef WANT_VST
+# undef VESTIGE_HEADER
+//# undef WANT_VST
 # undef WANT_AU
 # include "juce_core.h"
 # include "juce_audio_processors.h"
@@ -1474,25 +1475,25 @@ void do_juce_check(const char* const filename, const char* const stype, const bo
         if (desc->isInstrument)
             hints |= PLUGIN_IS_SYNTH;
 
-//         if (init)
-//         {
-//             if (AudioPluginInstance* const instance = pluginFormat->createInstanceFromDescription(*desc, kSampleRate, kBufferSize))
-//             {
-//                 instance->refreshParameterList();
-//
-//                 parameters = instance->getNumParameters();
-//                 programs   = instance->getNumPrograms();
-//
-//                 if (instance->hasEditor())
-//                     hints |= PLUGIN_HAS_CUSTOM_UI;
-//                 if (instance->acceptsMidi())
-//                     midiIns = 1;
-//                 if (instance->producesMidi())
-//                     midiOuts = 1;
-//
-//                 delete instance;
-//             }
-//         }
+        if (init)
+        {
+            if (AudioPluginInstance* const instance = pluginFormat->createInstanceFromDescription(*desc, kSampleRate, kBufferSize))
+            {
+                instance->refreshParameterList();
+
+                parameters = instance->getNumParameters();
+                programs   = instance->getNumPrograms();
+
+                if (instance->hasEditor())
+                    hints |= PLUGIN_HAS_CUSTOM_UI;
+                if (instance->acceptsMidi())
+                    midiIns = 1;
+                if (instance->producesMidi())
+                    midiOuts = 1;
+
+                delete instance;
+            }
+        }
 
         DISCOVERY_OUT("init", "-----------");
         DISCOVERY_OUT("name", desc->name);
@@ -1785,8 +1786,8 @@ int main(int argc, char* argv[])
     {
     case PLUGIN_LADSPA:
     case PLUGIN_DSSI:
-#ifndef HAVE_JUCE
     case PLUGIN_VST:
+#ifndef HAVE_JUCE
     case PLUGIN_AU:
 #endif
         openLib = true;
@@ -1852,11 +1853,11 @@ int main(int argc, char* argv[])
         do_lv2_check(filename, doInit);
         break;
     case PLUGIN_VST:
-#ifdef HAVE_JUCE
-        do_juce_check(filename, "vst", doInit);
-#else
+//#ifdef HAVE_JUCE
+//        do_juce_check(filename, "vst", doInit);
+//#else
         do_vst_check(handle, doInit);
-#endif
+//#endif
         break;
     case PLUGIN_AU:
 #ifdef HAVE_JUCE
@@ -1889,7 +1890,7 @@ int main(int argc, char* argv[])
 
 #ifdef HAVE_JUCE
 // --------------------------------------------------------------------------
-// we want juce processors but without UI code
+// we want juce_audio_processors but without UI code
 // this is copied from juce_audio_processors.cpp
 
 #include "juce_core/native/juce_BasicNativeHeaders.h"