From 5b3a4df9c0e24d593fd656043ffa598424ca2486 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 19 Feb 2013 19:38:52 +0000 Subject: [PATCH] CarlaPlugin renames; fix standalone build --- source/backend/engine/CarlaEngine.cpp | 2 -- source/backend/native/bypass.c | 2 +- source/backend/native/distrho-3bandeq.cpp | 2 +- .../backend/native/distrho-3bandsplitter.cpp | 2 +- source/backend/native/distrho-pingpongpan.cpp | 2 +- source/backend/native/midi-split.c | 4 ++-- source/backend/native/midi-through.c | 4 ++-- source/backend/native/zynaddsubfx.cpp | 7 +++--- source/backend/plugin/CarlaBridge.cpp | 8 +++++-- source/backend/plugin/CarlaPluginInternal.hpp | 1 + source/backend/plugin/CarlaPluginThread.cpp | 2 +- source/backend/plugin/CarlaPluginThread.hpp | 2 +- source/backend/plugin/DssiPlugin.cpp | 2 +- source/backend/plugin/FluidSynthPlugin.cpp | 2 +- source/backend/plugin/LadspaPlugin.cpp | 4 ++-- source/backend/plugin/LinuxSamplerPlugin.cpp | 2 +- source/backend/plugin/Lv2Plugin.cpp | 2 +- source/backend/plugin/Makefile | 24 +++++++++---------- source/backend/plugin/NativePlugin.cpp | 3 +-- source/backend/plugin/VstPlugin.cpp | 4 ++-- 20 files changed, 42 insertions(+), 39 deletions(-) diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index cc75365f3..5f2d628d1 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/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()) \ diff --git a/source/backend/native/bypass.c b/source/backend/native/bypass.c index ec0967de5..8f876f6ea 100644 --- a/source/backend/native/bypass.c +++ b/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) { diff --git a/source/backend/native/distrho-3bandeq.cpp b/source/backend/native/distrho-3bandeq.cpp index 65a934fe7..4307d93a2 100644 --- a/source/backend/native/distrho-3bandeq.cpp +++ b/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" diff --git a/source/backend/native/distrho-3bandsplitter.cpp b/source/backend/native/distrho-3bandsplitter.cpp index f15ed4b4b..972288f27 100644 --- a/source/backend/native/distrho-3bandsplitter.cpp +++ b/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" diff --git a/source/backend/native/distrho-pingpongpan.cpp b/source/backend/native/distrho-pingpongpan.cpp index fbacf4ee8..a1e76e6a2 100644 --- a/source/backend/native/distrho-pingpongpan.cpp +++ b/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" diff --git a/source/backend/native/midi-split.c b/source/backend/native/midi-split.c index 050d9e0ee..e5eb0c611 100644 --- a/source/backend/native/midi-split.c +++ b/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 diff --git a/source/backend/native/midi-through.c b/source/backend/native/midi-through.c index f85ff9b5c..4fd84ee34 100644 --- a/source/backend/native/midi-through.c +++ b/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 diff --git a/source/backend/native/zynaddsubfx.cpp b/source/backend/native/zynaddsubfx.cpp index f7fbc00e0..09788cac9 100644 --- a/source/backend/native/zynaddsubfx.cpp +++ b/source/backend/native/zynaddsubfx.cpp @@ -19,8 +19,9 @@ #define __STDC_LIMIT_MACROS #include -#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) diff --git a/source/backend/plugin/CarlaBridge.cpp b/source/backend/plugin/CarlaBridge.cpp index 877670919..b1269f1e8 100644 --- a/source/backend/plugin/CarlaBridge.cpp +++ b/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) diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp index f102fc3cc..db6ed21c1 100644 --- a/source/backend/plugin/CarlaPluginInternal.hpp +++ b/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" diff --git a/source/backend/plugin/CarlaPluginThread.cpp b/source/backend/plugin/CarlaPluginThread.cpp index 655588029..8bc39c652 100644 --- a/source/backend/plugin/CarlaPluginThread.cpp +++ b/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 diff --git a/source/backend/plugin/CarlaPluginThread.hpp b/source/backend/plugin/CarlaPluginThread.hpp index 3c6df5024..c8e365d38 100644 --- a/source/backend/plugin/CarlaPluginThread.hpp +++ b/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 diff --git a/source/backend/plugin/DssiPlugin.cpp b/source/backend/plugin/DssiPlugin.cpp index b9db64b21..105252044 100644 --- a/source/backend/plugin/DssiPlugin.cpp +++ b/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 diff --git a/source/backend/plugin/FluidSynthPlugin.cpp b/source/backend/plugin/FluidSynthPlugin.cpp index 3a5d48395..d907d7e57 100644 --- a/source/backend/plugin/FluidSynthPlugin.cpp +++ b/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 diff --git a/source/backend/plugin/LadspaPlugin.cpp b/source/backend/plugin/LadspaPlugin.cpp index 5dfbe7a6a..5f66026e5 100644 --- a/source/backend/plugin/LadspaPlugin.cpp +++ b/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 diff --git a/source/backend/plugin/LinuxSamplerPlugin.cpp b/source/backend/plugin/LinuxSamplerPlugin.cpp index 11cbf21d4..2eda959f8 100644 --- a/source/backend/plugin/LinuxSamplerPlugin.cpp +++ b/source/backend/plugin/LinuxSamplerPlugin.cpp @@ -17,7 +17,7 @@ // TODO - setMidiProgram() -#include "carla_plugin_internal.hpp" +#include "CarlaPluginInternal.hpp" #ifdef WANT_LINUXSAMPLER diff --git a/source/backend/plugin/Lv2Plugin.cpp b/source/backend/plugin/Lv2Plugin.cpp index 915caae45..307ad8f91 100644 --- a/source/backend/plugin/Lv2Plugin.cpp +++ b/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 diff --git a/source/backend/plugin/Makefile b/source/backend/plugin/Makefile index e40d128c9..330072e2c 100644 --- a/source/backend/plugin/Makefile +++ b/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 diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp index 1aa6b80a5..299ac1e52 100644 --- a/source/backend/plugin/NativePlugin.cpp +++ b/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 diff --git a/source/backend/plugin/VstPlugin.cpp b/source/backend/plugin/VstPlugin.cpp index e1b945bfe..82830736c 100644 --- a/source/backend/plugin/VstPlugin.cpp +++ b/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