CarlaPlugin renames; fix standalone build

source/backend/engine/CarlaEngine.cpp

@@ -1093,12 +1093,10 @@ void CarlaEngine::waitForProccessEnd()
 
 #ifndef BUILD_BRIDGE
 
-#if 0
 const QProcessEnvironment& CarlaEngine::getOptionsAsProcessEnvironment() const
 {
     return kData->procEnv;
 }
-#endif
 
 #define CARLA_ENGINE_SET_OPTION_RUNNING_CHECK \
     if (isRunning()) \

source/backend/native/bypass.c

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_native.h"
+#include "CarlaNative.h"
 
 static PluginHandle bypass_instantiate(const PluginDescriptor* _this_, HostDescriptor* host)
 {

source/backend/native/distrho-3bandeq.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_native.hpp"
+#include "CarlaNative.hpp"
 
 // Plugin Code
 #include "3bandeq/DistrhoArtwork3BandEQ.cpp"

source/backend/native/distrho-3bandsplitter.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_native.hpp"
+#include "CarlaNative.hpp"
 
 // Plugin Code
 #include "3bandsplitter/DistrhoArtwork3BandSplitter.cpp"

source/backend/native/distrho-pingpongpan.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_native.hpp"
+#include "CarlaNative.hpp"
 
 // Plugin Code
 #include "pingpongpan/DistrhoArtworkPingPongPan.cpp"

source/backend/native/midi-split.c

@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_native.h"
-#include "carla_midi.h"
+#include "CarlaNative.h"
+#include "CarlaMIDI.h"
 
 #include <stdlib.h>
 

source/backend/native/midi-through.c

@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_native.h"
-#include "carla_midi.h"
+#include "CarlaNative.h"
+#include "CarlaMIDI.h"
 
 #include <stdlib.h>
 

source/backend/native/zynaddsubfx.cpp

@@ -19,8 +19,9 @@
 #define __STDC_LIMIT_MACROS
 #include <cstdint>
 
-#include "carla_native.hpp"
-#include "carla_midi.h"
+#include "CarlaNative.hpp"
+#include "CarlaMIDI.h"
+#include "CarlaString.hpp"
 
 #include "zynaddsubfx/Misc/Master.h"
 #include "zynaddsubfx/Misc/Util.h"
@@ -180,7 +181,7 @@ protected:
         return;
 
         // unused, TODO
-        Q_UNUSED(value);
+        (void)value;
     }
 
     void setMidiProgram(const uint32_t bank, const uint32_t program)

source/backend/plugin/CarlaBridge.cpp

@@ -247,14 +247,16 @@ public:
             *type = GUI_NONE;
         *resizable = false;
     }
+#endif
 
     // -------------------------------------------------------------------
     // Set data (internal stuff)
 
-    int setOscBridgeInfo(const PluginBridgeInfoType type, const int argc, const lo_arg* const* const argv, const char* const types)
+    int setOscPluginBridgeInfo(const PluginBridgeInfoType type, const int argc, const lo_arg* const* const argv, const char* const types)
     {
-        qDebug("setOscBridgeInfo(%i, %i, %p, \"%s\")", type, argc, argv, types);
+        qDebug("setOscPluginBridgeInfo(%i, %i, %p, \"%s\")", type, argc, argv, types);
 
+#if 0
         switch (type)
         {
         case PluginBridgeAudioCount:
@@ -739,10 +741,12 @@ public:
             break;
         }
         }
+#endif
 
         return 0;
     }
 
+#if 0
     // -------------------------------------------------------------------
     // Set data (plugin-specific stuff)
 

source/backend/plugin/CarlaPluginInternal.hpp

@@ -23,6 +23,7 @@
 #include "CarlaEngine.hpp"
 #include "CarlaOscUtils.hpp"
 #include "CarlaStateUtils.hpp"
+#include "CarlaMutex.hpp"
 #include "CarlaMIDI.h"
 
 #include "RtList.hpp"

source/backend/plugin/CarlaPluginThread.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_plugin_internal.hpp"
+#include "CarlaPluginInternal.hpp"
 
 #include <QtCore/QProcess>
 

source/backend/plugin/CarlaPluginThread.hpp

@@ -18,7 +18,7 @@
 #ifndef __CARLA_PLUGIN_THREAD_HPP__
 #define __CARLA_PLUGIN_THREAD_HPP__
 
-#include "carla_backend_utils.hpp"
+#include "CarlaBackendUtils.hpp"
 
 #include <QtCore/QThread>
 

source/backend/plugin/DssiPlugin.cpp

@@ -19,7 +19,7 @@
 
 #ifdef WANT_DSSI
 
-#include "carla_ladspa_utils.hpp"
+#include "CarlaLadspaUtils.hpp"
 #include "dssi/dssi.h"
 
 CARLA_BACKEND_START_NAMESPACE

source/backend/plugin/FluidSynthPlugin.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_plugin_internal.hpp"
+#include "CarlaPluginInternal.hpp"
 
 #ifdef WANT_FLUIDSYNTH
 

source/backend/plugin/LadspaPlugin.cpp

@@ -15,11 +15,11 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_plugin_internal.hpp"
+#include "CarlaPluginInternal.hpp"
 
 #ifdef WANT_LADSPA
 
-#include "carla_ladspa_utils.hpp"
+#include "CarlaLadspaUtils.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/plugin/LinuxSamplerPlugin.cpp

@@ -17,7 +17,7 @@
 
 // TODO - setMidiProgram()
 
-#include "carla_plugin_internal.hpp"
+#include "CarlaPluginInternal.hpp"
 
 #ifdef WANT_LINUXSAMPLER
 

source/backend/plugin/Lv2Plugin.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_plugin_internal.hpp"
+#include "CarlaPluginInternal.hpp"
 
 #ifdef WANT_LV2
 

source/backend/plugin/Makefile

@@ -8,8 +8,8 @@ include ../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtGui)
-LINK_FLAGS      += $(shell pkg-config --libs liblo QtGui)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui)
+LINK_FLAGS      += $(shell pkg-config --libs liblo QtCore QtGui)
 
 ifeq ($(HAVE_SUIL),true)
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags suil-0)
@@ -29,16 +29,16 @@ endif
 # --------------------------------------------------------------
 
 OBJS = \
-	carla_plugin.cpp.o \
-	carla_plugin_thread.cpp.o \
-	carla_bridge.cpp.o \
-	native.cpp.o \
-	ladspa.cpp.o \
-	dssi.cpp.o \
-	lv2.cpp.o \
-	vst.cpp.o \
-	fluidsynth.cpp.o \
-	linuxsampler.cpp.o
+	CarlaPlugin.cpp.o \
+	CarlaPluginThread.cpp.o \
+	CarlaBridge.cpp.o \
+	NativePlugin.cpp.o \
+	LadspaPlugin.cpp.o \
+	DssiPlugin.cpp.o \
+	Lv2Plugin.cpp.o \
+	VstPlugin.cpp.o \
+	FluidSynthPlugin.cpp.o \
+	LinuxSamplerPlugin.cpp.o
 
 SHARED = ../libcarla_plugin.so
 STATIC = ../libcarla_plugin.a

source/backend/plugin/NativePlugin.cpp

@@ -15,8 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_plugin_internal.hpp"
-#include "carla_native.h"
+#include "CarlaPluginInternal.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/plugin/VstPlugin.cpp

@@ -15,11 +15,11 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#include "carla_plugin_internal.hpp"
+#include "CarlaPluginInternal.hpp"
 
 #ifdef WANT_VST
 
-#include "carla_vst_utils.hpp"
+#include "CarlaVstUtils.hpp"
 
 #ifdef Q_WS_X11
 # include <QtGui/QX11Info>