Cleanup, only enable some juce stuff if all libs are present

Makefile

@@ -40,21 +40,17 @@ ifeq ($(HAVE_AF_DEPS),true)
 ALL_LIBS += source/modules/audio_decoder.a
 endif
 
-ifeq ($(HAVE_DGL),true)
-ALL_LIBS += source/modules/dgl.a
-endif
-
 ALL_LIBS += source/modules/jackbridge.a
 
 ALL_LIBS += source/modules/juce_audio_basics.a
-ALL_LIBS += source/modules/juce_audio_devices.a
 ALL_LIBS += source/modules/juce_audio_formats.a
-ALL_LIBS += source/modules/juce_audio_processors.a
 ALL_LIBS += source/modules/juce_core.a
-ALL_LIBS += source/modules/juce_events.a
 
 ifeq ($(HAVE_JUCE_UI),true)
+ALL_LIBS += source/modules/juce_audio_devices.a
+ALL_LIBS += source/modules/juce_audio_processors.a
 ALL_LIBS += source/modules/juce_data_structures.a
+ALL_LIBS += source/modules/juce_events.a
 ALL_LIBS += source/modules/juce_graphics.a
 ALL_LIBS += source/modules/juce_gui_basics.a
 ALL_LIBS += source/modules/juce_gui_extra.a

source/Makefile.mk

@@ -141,17 +141,10 @@ ifneq ($(shell pkg-config --exists liblo && echo true),true)
 $(error liblo missing, cannot continue)
 endif
 
-ifeq ($(LINUX),true)
-ifneq ($(shell pkg-config --exists x11 && echo true),true)
-$(error X11 missing, cannot continue)
-endif
-endif
-
 # --------------------------------------------------------------
 # Check for optional libs (required by backend or bridges)
 
 ifeq ($(MACOS_OR_WIN32),true)
-HAVE_DGL        = true
 HAVE_JUCE_UI    = true
 else
 HAVE_FFMPEG     = $(shell pkg-config --exists libavcodec libavformat libavutil && echo true)
@@ -161,10 +154,9 @@ HAVE_QT4        = $(shell pkg-config --exists QtCore QtGui && echo true)
 HAVE_QT5        = $(shell pkg-config --exists Qt5Core Qt5Gui Qt5Widgets && echo true)
 ifeq ($(LINUX),true)
 HAVE_ALSA       = $(shell pkg-config --exists alsa && echo true)
-HAVE_DGL        = $(shell pkg-config --exists gl && echo true)
-HAVE_JUCE_UI    = $(shell pkg-config --exists xinerama xext xcursor freetype2 TODO && echo true)
+HAVE_JUCE_UI    = $(shell pkg-config --exists x11 xinerama xext xcursor freetype2 TODO && echo true)
 HAVE_PULSEAUDIO = $(shell pkg-config --exists libpulse-simple && echo true)
-HAVE_X11        = true
+HAVE_X11        = $(shell pkg-config --exists x11 && echo true)
 endif
 endif
 
@@ -228,10 +220,6 @@ HAVE_ZYN_UI_DEPS  = $(shell pkg-config --exists ntk_images ntk && echo true)
 # --------------------------------------------------------------
 # Set base defines
 
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
 ifeq ($(HAVE_FFMPEG),true)
 BASE_FLAGS += -DHAVE_FFMPEG
 endif
@@ -289,15 +277,11 @@ RTMEMPOOL_LIBS = -lpthread
 endif
 
 ifeq ($(LINUX),true)
-ifeq ($(HAVE_DGL),true)
-DGL_FLAGS                = $(shell pkg-config --cflags gl x11)
-DGL_LIBS                 = $(shell pkg-config --libs gl x11)
-endif
 JACKBRIDGE_LIBS          = -ldl -lpthread -lrt
 JUCE_CORE_LIBS           = -ldl -lpthread -lrt
+ifeq ($(HAVE_JUCE_UI),true)
 JUCE_EVENTS_FLAGS        = $(shell pkg-config --cflags x11)
 JUCE_EVENTS_LIBS         = $(shell pkg-config --libs x11)
-ifeq ($(HAVE_JUCE_UI),true)
 JUCE_GRAPHICS_FLAGS      = $(shell pkg-config --cflags x11 xinerama xext freetype2)
 JUCE_GRAPHICS_LIBS       = $(shell pkg-config --libs x11 xinerama xext freetype2)
 JUCE_GUI_BASICS_FLAGS    = $(shell pkg-config --cflags x11 xinerama xext xcursor)
@@ -317,7 +301,6 @@ endif
 endif
 
 ifeq ($(MACOS),true)
-DGL_LIBS                   = -framework OpenGL -framework Cocoa
 JACKBRIDGE_LIBS            = -ldl -lpthread
 JUCE_AUDIO_BASICS_LIBS     = -framework Accelerate
 JUCE_AUDIO_DEVICES_LIBS    = -framework AppKit -framework AudioToolbox -framework CoreAudio -framework CoreMIDI
@@ -336,7 +319,6 @@ RTMIDI_LIBS               += -framework CoreAudio -framework CoreMIDI -framework
 endif
 
 ifeq ($(WIN32),true)
-DGL_LIBS                = -lopengl32 -lgdi32
 JACKBRIDGE_LIBS         = -lpthread
 JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32
 JUCE_CORE_LIBS          = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
@@ -352,10 +334,6 @@ endif
 # --------------------------------------------------------------
 # Set libs stuff (part 3)
 
-ifeq ($(HAVE_DGL),true)
-NATIVE_PLUGINS_LIBS  += $(DGL_LIBS)
-endif
-
 ifeq ($(HAVE_AF_DEPS),true)
 NATIVE_PLUGINS_FLAGS += -DWANT_AUDIOFILE
 NATIVE_PLUGINS_LIBS  += $(AUDIO_DECODER_LIBS)

source/backend/Makefile

@@ -14,11 +14,8 @@ STANDALONE_LIBS += carla_plugin.a
 
 STANDALONE_LIBS += ../modules/jackbridge.a
 STANDALONE_LIBS += ../modules/juce_audio_basics.a
-STANDALONE_LIBS += ../modules/juce_audio_devices.a
 STANDALONE_LIBS += ../modules/juce_audio_formats.a
-STANDALONE_LIBS += ../modules/juce_audio_processors.a
 STANDALONE_LIBS += ../modules/juce_core.a
-STANDALONE_LIBS += ../modules/juce_events.a
 STANDALONE_LIBS += ../modules/native-plugins.a
 STANDALONE_LIBS += ../modules/rtaudio.a
 STANDALONE_LIBS += ../modules/rtmempool.a
@@ -32,12 +29,11 @@ ifeq ($(HAVE_AF_DEPS),true)
 STANDALONE_LIBS += ../modules/audio_decoder.a
 endif
 
-ifeq ($(HAVE_DGL),true)
-STANDALONE_LIBS += ../modules/dgl.a
-endif
-
 ifeq ($(HAVE_JUCE_UI),true)
+STANDALONE_LIBS += ../modules/juce_audio_devices.a
+STANDALONE_LIBS += ../modules/juce_audio_processors.a
 STANDALONE_LIBS += ../modules/juce_data_structures.a
+STANDALONE_LIBS += ../modules/juce_events.a
 STANDALONE_LIBS += ../modules/juce_graphics.a
 STANDALONE_LIBS += ../modules/juce_gui_basics.a
 STANDALONE_LIBS += ../modules/juce_gui_extra.a
@@ -48,9 +44,7 @@ endif
 STANDALONE_FLAGS  = $(JACKBRIDGE_LIBS)
 STANDALONE_FLAGS += $(JUCE_CORE_LIBS)
 STANDALONE_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
-STANDALONE_FLAGS += $(JUCE_AUDIO_DEVICES_LIBS)
 STANDALONE_FLAGS += $(JUCE_AUDIO_FORMATS_LIBS)
-STANDALONE_FLAGS += $(JUCE_EVENTS_LIBS)
 STANDALONE_FLAGS += $(LIBLO_LIBS)
 STANDALONE_FLAGS += $(NATIVE_PLUGINS_LIBS)
 STANDALONE_FLAGS += $(RTAUDIO_LIBS)
@@ -70,8 +64,10 @@ STANDALONE_FLAGS += $(LINUXSAMPLER_LIBS)
 endif
 
 ifeq ($(HAVE_JUCE_UI),true)
+STANDALONE_FLAGS += $(JUCE_AUDIO_DEVICES_LIBS)
 STANDALONE_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS)
 STANDALONE_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
+STANDALONE_FLAGS += $(JUCE_EVENTS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GRAPHICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GUI_BASICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GUI_EXTRA_LIBS)

source/backend/engine/CarlaEngine.cpp

@@ -74,7 +74,9 @@ uint CarlaEngine::getDriverCount()
 
 #ifndef BUILD_BRIDGE
     count += getRtAudioApiCount();
+# ifdef HAVE_JUCE_UI
     count += getJuceApiCount();
+# endif
 #endif
 
     return count;
@@ -97,12 +99,14 @@ const char* CarlaEngine::getDriverName(const uint index2)
         index -= count;
     }
 
+# ifdef HAVE_JUCE_UI
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
             return getJuceApiName(index);
         //index -= count;
     }
+# endif
 #endif
 
     carla_stderr("CarlaEngine::getDriverName(%i) - invalid index", index2);
@@ -129,12 +133,14 @@ const char* const* CarlaEngine::getDriverDeviceNames(const uint index2)
         index -= count;
     }
 
+# ifdef HAVE_JUCE_UI
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
             return getJuceApiDeviceNames(index);
         //index -= count;
     }
+# endif
 #endif
 
     carla_stderr("CarlaEngine::getDriverDeviceNames(%i) - invalid index", index2);
@@ -165,12 +171,14 @@ const EngineDriverDeviceInfo* CarlaEngine::getDriverDeviceInfo(const uint index2
         index -= count;
     }
 
+# ifdef HAVE_JUCE_UI
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
             return getJuceDeviceInfo(index, deviceName);
         //index -= count;
     }
+# endif
 #endif
 
     carla_stderr("CarlaEngine::getDriverDeviceNames(%i, \"%s\") - invalid index", index2, deviceName);
@@ -208,16 +216,28 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
     // macos
 
     if (std::strcmp(driverName, "CoreAudio") == 0)
+# ifdef HAVE_JUCE_UI
         return newJuce(AUDIO_API_CORE);
+# else
+        return newRtAudio(AUDIO_API_DS);
+# endif
 
     // -------------------------------------------------------------------
     // windows
 
     if (std::strcmp(driverName, "ASIO") == 0)
+# ifdef HAVE_JUCE_UI
         return newJuce(AUDIO_API_ASIO);
+# else
+        return newRtAudio(AUDIO_API_DS);
+# endif
 
     if (std::strcmp(driverName, "DirectSound") == 0)
+# ifdef HAVE_JUCE_UI
         return newJuce(AUDIO_API_DS);
+# else
+        return newRtAudio(AUDIO_API_DS);
+# endif
 #endif
 
     carla_stderr("CarlaEngine::newDriverByName(\"%s\") - invalid driver name", driverName);

source/backend/engine/CarlaEngineGraph.cpp

@@ -22,16 +22,16 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaMIDI.h"
 
-#include "juce_audio_processors.h"
-//#include "JuceInternalFilters.hpp"
-
-using juce::jmax;
+#ifdef HAVE_JUCE_UI
 using juce::AudioPluginInstance;
 using juce::AudioProcessor;
 using juce::AudioProcessorEditor;
+using juce::PluginDescription;
+#endif
+
+using juce::jmax;
 using juce::FloatVectorOperations;
 using juce::MemoryBlock;
-using juce::PluginDescription;
 using juce::String;
 
 CARLA_BACKEND_START_NAMESPACE
@@ -729,6 +729,7 @@ void RackGraph::processHelper(CarlaEngine::ProtectedData* const data, const floa
     }
 }
 
+#ifdef HAVE_JUCE_UI
 // -----------------------------------------------------------------------
 
 class CarlaPluginInstance : public AudioPluginInstance
@@ -1045,6 +1046,7 @@ void PatchbayGraph::process(CarlaEngine::ProtectedData* const data, const float*
         fillEngineEventsFromJuceMidiBuffer(data->events.out, midiBuffer);
     }
 }
+#endif
 
 // -----------------------------------------------------------------------
 // InternalGraph
@@ -1071,13 +1073,18 @@ void EngineInternalGraph::create(const bool isRack, const double sampleRate, con
         CARLA_SAFE_ASSERT_RETURN(fRack == nullptr,);
         fRack = new RackGraph(bufferSize, inputs, outputs);
     }
+#ifdef HAVE_JUCE_UI
     else
     {
         CARLA_SAFE_ASSERT_RETURN(fPatchbay == nullptr,);
         fPatchbay = new PatchbayGraph(static_cast<int>(bufferSize), sampleRate, inputs, outputs);
     }
+#endif
 
     fIsReady = true;
+
+    // unused
+    return; (void)sampleRate;
 }
 
 void EngineInternalGraph::destroy() noexcept
@@ -1096,12 +1103,14 @@ void EngineInternalGraph::destroy() noexcept
         delete fRack;
         fRack = nullptr;
     }
+#ifdef HAVE_JUCE_UI
     else
     {
         CARLA_SAFE_ASSERT_RETURN(fPatchbay != nullptr,);
         delete fPatchbay;
         fPatchbay = nullptr;
     }
+#endif
 }
 
 void EngineInternalGraph::setBufferSize(const uint32_t bufferSize)
@@ -1113,11 +1122,13 @@ void EngineInternalGraph::setBufferSize(const uint32_t bufferSize)
         CARLA_SAFE_ASSERT_RETURN(fRack != nullptr,);
         fRack->setBufferSize(bufferSize);
     }
+#ifdef HAVE_JUCE_UI
     else
     {
         CARLA_SAFE_ASSERT_RETURN(fPatchbay != nullptr,);
         fPatchbay->setBufferSize(static_cast<int>(bufferSize));
     }
+#endif
 }
 
 void EngineInternalGraph::setSampleRate(const double sampleRate)
@@ -1128,11 +1139,16 @@ void EngineInternalGraph::setSampleRate(const double sampleRate)
     {
         CARLA_SAFE_ASSERT_RETURN(fRack != nullptr,);
     }
+#ifdef HAVE_JUCE_UI
     else
     {
         CARLA_SAFE_ASSERT_RETURN(fPatchbay != nullptr,);
         fPatchbay->setSampleRate(sampleRate);
     }
+#endif
+
+    // unused
+    return; (void)sampleRate;
 }
 
 void EngineInternalGraph::setOffline(const bool offline)
@@ -1144,11 +1160,13 @@ void EngineInternalGraph::setOffline(const bool offline)
         CARLA_SAFE_ASSERT_RETURN(fRack != nullptr,);
         fRack->setOffline(offline);
     }
+#ifdef HAVE_JUCE_UI
     else
     {
         CARLA_SAFE_ASSERT_RETURN(fPatchbay != nullptr,);
         fPatchbay->setOffline(offline);
     }
+#endif
 }
 
 bool EngineInternalGraph::isReady() const noexcept
@@ -1177,11 +1195,13 @@ void EngineInternalGraph::process(CarlaEngine::ProtectedData* const data, const
         CARLA_SAFE_ASSERT_RETURN(fRack != nullptr,);
         fRack->processHelper(data, inBuf, outBuf, frames);
     }
+#ifdef HAVE_JUCE_UI
     else
     {
         CARLA_SAFE_ASSERT_RETURN(fPatchbay != nullptr,);
         fPatchbay->process(data, inBuf, outBuf, static_cast<int>(frames));
     }
+#endif
 }
 
 void EngineInternalGraph::processRack(CarlaEngine::ProtectedData* const data, const float* inBuf[2], float* outBuf[2], const uint32_t frames)

source/backend/engine/CarlaEngineGraph.hpp

@@ -23,11 +23,14 @@
 #include "CarlaPatchbayUtils.hpp"
 #include "CarlaStringList.hpp"
 
-#include "juce_audio_processors.h"
-
+#ifdef HAVE_JUCE_UI
+# include "juce_audio_processors.h"
 using juce::AudioProcessorGraph;
 using juce::AudioSampleBuffer;
 using juce::MidiBuffer;
+#else
+# include "juce_audio_basics.h"
+#endif
 
 CARLA_BACKEND_START_NAMESPACE
 
@@ -102,6 +105,7 @@ struct RackGraph {
     void processHelper(CarlaEngine::ProtectedData* const data, const float* const* const inBuf, float* const* const outBuf, const uint32_t frames);
 };
 
+#ifdef HAVE_JUCE_UI
 // -----------------------------------------------------------------------
 // PatchbayGraph
 
@@ -133,6 +137,7 @@ struct PatchbayGraph  {
 
     void process(CarlaEngine::ProtectedData* const data, const float* const* const inBuf, float* const* const outBuf, const int frames);
 };
+#endif
 
 // -----------------------------------------------------------------------
 

source/backend/engine/CarlaEngineJuce.cpp

@@ -28,10 +28,6 @@ using namespace juce;
 
 CARLA_BACKEND_START_NAMESPACE
 
-#if 0
-} // Fix editor indentation
-#endif
-
 // -------------------------------------------------------------------------------------------------------------------
 // Global static data
 

source/backend/engine/CarlaEngineRtAudio.cpp

@@ -59,14 +59,16 @@ static void initRtAudioAPIsIfNeeded()
     {
         const RtAudio::Api& api(*it);
 
-        if (api == RtAudio::LINUX_ALSA)
-            continue;
+        //if (api == RtAudio::LINUX_ALSA)
+        //    continue;
+#ifdef HAVE_JUCE_UI
         if (api == RtAudio::MACOSX_CORE)
             continue;
         if (api == RtAudio::WINDOWS_ASIO)
             continue;
         if (api == RtAudio::WINDOWS_DS)
             continue;
+#endif
         if (api == RtAudio::UNIX_JACK && ! jackbridge_is_ok())
             continue;
 

source/backend/engine/Makefile

@@ -21,12 +21,17 @@ OBJS = \
 
 OBJSa = $(OBJS) \
 	CarlaEngineJack.cpp.o \
-	CarlaEngineJuce.cpp.o \
 	CarlaEngineRtAudio.cpp.o
 
+ifeq ($(HAVE_JUCE_UI),true)
+OBJSa += \
+	CarlaEngineJuce.cpp.o
+endif
+
 ifneq ($(WIN32),true)
 OBJSa += \
 	CarlaEngineNative.cpp.o
+
 OBJSp  = $(OBJS) \
 	CarlaEngineNative.cpp.exp.o
 endif

source/bridges/Makefile

@@ -23,7 +23,6 @@ BUILD_PLUGIN_FLAGS += -I../backend/engine -I../backend/plugin
 LINK_PLUGIN_FLAGS   = $(LINK_FLAGS)
 LINK_PLUGIN_FLAGS  += $(JUCE_AUDIO_BASICS_LIBS)
 LINK_PLUGIN_FLAGS  += $(JUCE_CORE_LIBS)
-LINK_PLUGIN_FLAGS  += $(JUCE_EVENTS_LIBS)
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 BUILD_PLUGIN_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_VST3
@@ -38,6 +37,7 @@ endif
 ifeq ($(HAVE_JUCE_UI),true)
 LINK_PLUGIN_FLAGS  += $(JUCE_AUDIO_PROCESSORS_LIBS)
 LINK_PLUGIN_FLAGS  += $(JUCE_DATA_STRUCTURES_LIBS)
+LINK_PLUGIN_FLAGS  += $(JUCE_EVENTS_LIBS)
 LINK_PLUGIN_FLAGS  += $(JUCE_GRAPHICS_LIBS)
 LINK_PLUGIN_FLAGS  += $(JUCE_GUI_BASICS_LIBS)
 endif
@@ -73,10 +73,6 @@ WIN_LINK_FLAGS  = $(LINK_PLUGIN_FLAGS) -L../modules
 NATIVE_BUILD_FLAGS  = $(POSIX_BUILD_FLAGS) -DWANT_NATIVE
 NATIVE_LINK_FLAGS   = $(POSIX_LINK_FLAGS)
 
-ifeq ($(HAVE_DGL),true)
-NATIVE_LINK_FLAGS  += $(DGL_LIBS)
-endif
-
 ifeq ($(HAVE_FLUIDSYNTH),true)
 NATIVE_BUILD_FLAGS += -DWANT_FLUIDSYNTH
 NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS)
@@ -493,19 +489,14 @@ LIBS_NATIVE = \
 	../modules/jackbridge.a \
 	../modules/juce_audio_basics.a \
 	../modules/juce_core.a \
-	../modules/juce_events.a \
 	../modules/rtmempool.a
 
-ifeq ($(HAVE_DGL),true)
-LIBS_NATIVE += \
-	../modules/dgl.a
-endif
-
 ifeq ($(HAVE_JUCE_UI),true)
 LIBS_NATIVE += \
 	../modules/juce_audio_processors.a \
 	../modules/juce_data_structures.a \
 	../modules/juce_data_structures.a \
+	../modules/juce_events.a \
 	../modules/juce_graphics.a \
 	../modules/juce_gui_basics.a \
 	../modules/juce_gui_extra.a

source/modules/juce_audio_basics.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_audio_devices.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_audio_formats.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_audio_processors.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_core.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_core/AppConfig.h

@@ -71,10 +71,8 @@
 
 // always enabled
 #define JUCE_MODULE_AVAILABLE_juce_audio_basics          1
-#define JUCE_MODULE_AVAILABLE_juce_audio_devices         1
 #define JUCE_MODULE_AVAILABLE_juce_audio_formats         1
 #define JUCE_MODULE_AVAILABLE_juce_core                  1
-#define JUCE_MODULE_AVAILABLE_juce_events                1
 
 // always disabled
 #define JUCE_MODULE_AVAILABLE_juce_audio_utils           0
@@ -84,14 +82,18 @@
 
 // conditional
 #ifdef HAVE_JUCE_UI
+# define JUCE_MODULE_AVAILABLE_juce_audio_devices        1
 # define JUCE_MODULE_AVAILABLE_juce_audio_processors     1
 # define JUCE_MODULE_AVAILABLE_juce_data_structures      1
+# define JUCE_MODULE_AVAILABLE_juce_events               1
 # define JUCE_MODULE_AVAILABLE_juce_graphics             1
 # define JUCE_MODULE_AVAILABLE_juce_gui_basics           1
 # define JUCE_MODULE_AVAILABLE_juce_gui_extra            1
 #else
+# define JUCE_MODULE_AVAILABLE_juce_audio_devices        0
 # define JUCE_MODULE_AVAILABLE_juce_audio_processors     0
 # define JUCE_MODULE_AVAILABLE_juce_data_structures      0
+# define JUCE_MODULE_AVAILABLE_juce_events               0
 # define JUCE_MODULE_AVAILABLE_juce_graphics             0
 # define JUCE_MODULE_AVAILABLE_juce_gui_basics           0
 # define JUCE_MODULE_AVAILABLE_juce_gui_extra            0

source/modules/juce_data_structures.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_events.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,6 +18,10 @@
 #ifndef CARLA_JUCE_EVENTS_H_INCLUDED
 #define CARLA_JUCE_EVENTS_H_INCLUDED
 
+#ifndef HAVE_JUCE_UI
+# error Can't have juce_events with the current setup
+#endif
+
 #include "juce_core.h"
 
 #include "juce_events/AppConfig.h"

source/modules/juce_graphics.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/juce_gui_basics.h

@@ -1,6 +1,6 @@
 /*
  * Carla Juce setup
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

source/modules/native-plugins/Makefile

@@ -93,37 +93,6 @@ OBJS += \
 	notes.cpp.o
 endif
 
-# --------------------------------------------------------------
-# DISTRHO plugins
-
-OBJS += \
-	distrho-3bandeq.cpp.o \
-	distrho-3bandsplitter.cpp.o \
-	distrho-pingpongpan.cpp.o \
-	distrho-nekobi.cpp.o
-#	distrho-stereoenhancer.cpp.o
-
-OBJS += \
-	distrho-groovejuice.cpp.o \
-	distrho-powerjuice.cpp.o \
-	distrho-segmentjuice.cpp.o \
-	distrho-vectorjuice.cpp.o \
-	distrho-wobblejuice.cpp.o
-
-OBJS += \
-	distrho-zamcomp.cpp.o \
-	distrho-zamcompx2.cpp.o \
-	distrho-zameq2.cpp.o \
-	distrho-zamsynth.cpp.o \
-	distrho-zamtube.cpp.o \
-	distrho-zamulticomp.cpp.o \
-	distrho-zamulticompx2.cpp.o
-
-ifeq ($(HAVE_PM_DEPS),true)
-OBJS += \
-	distrho-prom.cpp.o
-endif
-
 ifeq ($(HAVE_JUCE_UI),true)
 # --------------------------------------------------------------
 # JUCE based plugins

source/modules/native-plugins/_all.c

@@ -35,27 +35,6 @@ extern void carla_register_native_plugin_bigmeter();
 extern void carla_register_native_plugin_notes();
 #endif
 
-// DISTRHO plugins
-extern void carla_register_native_plugin_3bandeq();
-extern void carla_register_native_plugin_3bandsplitter();
-extern void carla_register_native_plugin_nekobi();
-extern void carla_register_native_plugin_pingpongpan();
-extern void carla_register_native_plugin_stereoenhancer();
-
-extern void carla_register_native_plugin_groovejuice();
-extern void carla_register_native_plugin_powerjuice();
-extern void carla_register_native_plugin_segmentjuice();
-extern void carla_register_native_plugin_vectorjuice();
-extern void carla_register_native_plugin_wobblejuice();
-
-extern void carla_register_native_plugin_zamcomp();
-extern void carla_register_native_plugin_zamcompx2();
-extern void carla_register_native_plugin_zameq2();
-extern void carla_register_native_plugin_zamsynth();
-extern void carla_register_native_plugin_zamtube();
-extern void carla_register_native_plugin_zamulticomp();
-extern void carla_register_native_plugin_zamulticompx2();
-
 #ifdef HAVE_JUCE_UI
 // JUCE based plugins
 extern void carla_register_native_plugin_jucepatchbay();
@@ -73,11 +52,6 @@ extern void carla_register_native_plugin_audiofile();
 extern void carla_register_native_plugin_midifile();
 #endif
 
-#ifdef WANT_PROJECTM
-// ProjectM
-extern void carla_register_native_plugin_prom();
-#endif
-
 // SunVox File
 extern void carla_register_native_plugin_sunvoxfile();
 
@@ -107,27 +81,6 @@ void carla_register_all_plugins()
     carla_register_native_plugin_notes();
 #endif
 
-    // DISTRHO plugins
-    carla_register_native_plugin_3bandeq();
-    carla_register_native_plugin_3bandsplitter();
-    carla_register_native_plugin_nekobi();
-    carla_register_native_plugin_pingpongpan();
-    //carla_register_native_plugin_stereoenhancer();
-
-    carla_register_native_plugin_groovejuice();
-    carla_register_native_plugin_powerjuice();
-    carla_register_native_plugin_segmentjuice();
-    carla_register_native_plugin_vectorjuice();
-    carla_register_native_plugin_wobblejuice();
-
-    carla_register_native_plugin_zamcomp();
-    carla_register_native_plugin_zamcompx2();
-    carla_register_native_plugin_zameq2();
-    carla_register_native_plugin_zamsynth();
-    carla_register_native_plugin_zamtube();
-    carla_register_native_plugin_zamulticomp();
-    carla_register_native_plugin_zamulticompx2();
-
 #ifdef HAVE_JUCE_UI
     // JUCE based plugins
     carla_register_native_plugin_jucepatchbay();
@@ -145,14 +98,6 @@ void carla_register_all_plugins()
     carla_register_native_plugin_midifile();
 #endif
 
-#ifdef WANT_PROJECTM
-    // ProjectM
-    carla_register_native_plugin_prom();
-#endif
-
-    // SunVox File
-    //carla_register_native_plugin_sunvoxfile();
-
 #ifdef WANT_ZYNADDSUBFX
     // ZynAddSubFX
     carla_register_native_plugin_zynaddsubfx_fx();

source/plugin/Makefile

@@ -17,9 +17,7 @@ BUILD_CXX_FLAGS += $(NATIVE_PLUGINS_FLAGS)
 
 LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
 LINK_FLAGS += $(JUCE_CORE_LIBS)
-LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(LIBLO_LIBS)
-LINK_FLAGS += $(QTCORE_LIBS)
 LINK_FLAGS += $(RTMEMPOOL_LIBS)
 
 # --------------------------------------------------------------
@@ -45,13 +43,10 @@ endif
 # --------------------------------------------------------------
 # Coomon
 
-ifeq ($(HAVE_DGL),true)
-LINK_FLAGS += $(DGL_LIBS)
-endif
-
 ifeq ($(HAVE_JUCE_UI),true)
 LINK_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS)
 LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
+LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
@@ -71,21 +66,17 @@ LIBS += ../backend/carla_plugin.a
 LIBS += ../modules/native-plugins.a
 LIBS += ../modules/jackbridge.a
 LIBS += ../modules/juce_audio_basics.a
-LIBS += ../modules/juce_audio_processors.a
 LIBS += ../modules/juce_core.a
-LIBS += ../modules/juce_events.a
 LIBS += ../modules/rtmempool.a
 
 ifeq ($(HAVE_AF_DEPS),true)
 LIBS += ../modules/audio_decoder.a
 endif
 
-ifeq ($(HAVE_DGL),true)
-LIBS += ../modules/dgl.a
-endif
-
 ifeq ($(HAVE_JUCE_UI),true)
+LIBS += ../modules/juce_audio_processors.a
 LIBS += ../modules/juce_data_structures.a
+LIBS += ../modules/juce_events.a
 LIBS += ../modules/juce_graphics.a
 LIBS += ../modules/juce_gui_basics.a
 LIBS += ../modules/juce_gui_extra.a

source/plugin/carla-native-base.cpp

@@ -48,15 +48,7 @@ struct PluginListManager {
                 continue;
 
             // skip some plugins
-            if (std::strcmp(desc->label,  "3bandeq"       ) == 0 ||
-                std::strcmp(desc->label,  "3bandsplitter" ) == 0 ||
-                std::strcmp(desc->label,  "pingpongpan"   ) == 0 ||
-                std::strcmp(desc->label,  "stereoenhancer") == 0 ||
-                std::strcmp(desc->label,  "nekobi"        ) == 0 ||
-                std::strcmp(desc->label,  "prom"          ) == 0 ||
-                std::strcmp(desc->label,  "vexsynth"      ) == 0 ||
-                std::strstr(desc->label,  "juice"         ) != nullptr ||
-                std::strncmp(desc->label, "zam", 3) == 0)
+            if (std::strcmp(desc->label, "vexsynth") == 0)
             {
                 continue;
             }