From 4639a106a52cce61f97a6bc8bf00b6d21ab7ed29 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 2 Nov 2012 11:20:36 +0000
Subject: [PATCH] Carla: More code for future plugin support

---
 c++/carla-backend/Makefile                    | 3 +++
 c++/carla-backend/Makefile.dbg                | 3 +++
 c++/carla-backend/carla_engine.cpp            | 9 ++++++++-
 c++/carla-backend/carla_engine.h              | 4 ++--
 c++/carla-backend/carla_threads.cpp           | 3 ++-
 c++/carla-backend/qtcreator/carla-backend.pro | 6 ++++--
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/c++/carla-backend/Makefile b/c++/carla-backend/Makefile
index a2c1032..509aa3e 100644
--- a/c++/carla-backend/Makefile
+++ b/c++/carla-backend/Makefile
@@ -104,6 +104,9 @@ doc: carla_backend.doxygen
 carla_backend.so: $(OBJS)
 	$(CXX) $^ $(CARLA_LD_FLAGS) -o $@ && strip $@
 
+carla_backend-dssi.so: $(OBJS) carla_backend_plugin.cpp
+	$(CXX) $^ -DDISTRHO_PLUGIN_TARGET_DSSI -Idistrho-plugin-toolkit $(CARLA_CXX_FLAGS) $(CARLA_LD_FLAGS) -o $@ && strip $@
+
 # --------------------------------------------------------------
 
 .c.o:
diff --git a/c++/carla-backend/Makefile.dbg b/c++/carla-backend/Makefile.dbg
index 84ac7e5..f71d336 100644
--- a/c++/carla-backend/Makefile.dbg
+++ b/c++/carla-backend/Makefile.dbg
@@ -104,6 +104,9 @@ doc: carla_backend.doxygen
 carla_backend.so: $(OBJS)
 	$(CXX) $^ $(CARLA_LD_FLAGS) -o $@
 
+carla_backend-dssi.so: $(OBJS) carla_backend_plugin.cpp
+	$(CXX) $^ -DDISTRHO_PLUGIN_TARGET_DSSI -Idistrho-plugin-toolkit $(CARLA_CXX_FLAGS) $(CARLA_LD_FLAGS) -o $@
+
 # --------------------------------------------------------------
 
 .c.o:
diff --git a/c++/carla-backend/carla_engine.cpp b/c++/carla-backend/carla_engine.cpp
index 6a62ee7..04704ce 100644
--- a/c++/carla-backend/carla_engine.cpp
+++ b/c++/carla-backend/carla_engine.cpp
@@ -236,7 +236,8 @@ bool CarlaEngine::init(const char* const clientName)
     m_osc.init(clientName);
     m_oscData = m_osc.getControlData();
 
-    carla_setprocname(clientName);
+    if (strcmp(clientName, "Carla"))
+        carla_setprocname(clientName);
 #endif
 
     return true;
@@ -836,6 +837,12 @@ void CarlaEngine::bufferSizeChanged(const uint32_t newBufferSize)
     }
 }
 
+void CarlaEngine::startCheckThread()
+{
+    if (! m_checkThread.isRunning())
+        m_checkThread.startNow();
+}
+
 // -------------------------------------------------------------------------------------------------------------------
 // Carla Engine Client
 
diff --git a/c++/carla-backend/carla_engine.h b/c++/carla-backend/carla_engine.h
index 99b8f37..19cd4a3 100644
--- a/c++/carla-backend/carla_engine.h
+++ b/c++/carla-backend/carla_engine.h
@@ -53,8 +53,7 @@ enum CarlaEngineType {
     CarlaEngineTypeNull,
     CarlaEngineTypeJack,
     CarlaEngineTypeRtAudio,
-    CarlaEngineTypePluginLv2,
-    CarlaEngineTypePluginVst
+    CarlaEngineTypePlugin
 };
 
 enum CarlaEnginePortType {
@@ -382,6 +381,7 @@ protected:
     CarlaTimeInfo timeInfo;
 
     void bufferSizeChanged(const uint32_t newBufferSize);
+    void startCheckThread();
 
 private:
     CarlaCheckThread m_checkThread;
diff --git a/c++/carla-backend/carla_threads.cpp b/c++/carla-backend/carla_threads.cpp
index 55e8411..3cec82c 100644
--- a/c++/carla-backend/carla_threads.cpp
+++ b/c++/carla-backend/carla_threads.cpp
@@ -80,7 +80,8 @@ void CarlaCheckThread::run()
         oscControlRegisted = engine->isOscControlRegisted();
 
 #ifndef BUILD_BRIDGE
-        engine->oscWaitEvents();
+        if (engine->getType() != CarlaEngineTypePlugin)
+            engine->oscWaitEvents();
 #endif
 
         for (unsigned short i=0; i < maxPluginNumber; i++)
diff --git a/c++/carla-backend/qtcreator/carla-backend.pro b/c++/carla-backend/qtcreator/carla-backend.pro
index 6f94453..c455618 100644
--- a/c++/carla-backend/qtcreator/carla-backend.pro
+++ b/c++/carla-backend/qtcreator/carla-backend.pro
@@ -15,8 +15,8 @@ TEMPLATE = app
 VERSION  = 0.5.0
 
 SOURCES  = \
+    ../carla_backend_plugin.cpp \
     ../carla_backend_standalone.cpp \
-    ../carla_backend_vst.cpp \
     ../carla_bridge.cpp \
     ../carla_engine.cpp \
     ../carla_engine_jack.cpp \
@@ -64,7 +64,8 @@ HEADERS = \
 
 INCLUDEPATH = .. \
     ../../carla-jackbridge \
-    ../../carla-includes
+    ../../carla-includes \
+    ../distrho-plugin-toolkit
 
 LIBS     =  -ldl \
     ../../carla-lilv/carla_lilv.a \
@@ -76,6 +77,7 @@ DEFINES += CARLA_ENGINE_JACK
 DEFINES += CARLA_ENGINE_RTAUDIO HAVE_GETTIMEOFDAY __LINUX_ALSA__ __LINUX_ALSASEQ__ __LINUX_PULSE__ __RTAUDIO_DEBUG__ __RTMIDI_DEBUG__
 DEFINES += CARLA_ENGINE_LV2
 DEFINES += CARLA_ENGINE_VST
+DEFINES += DISTRHO_PLUGIN_TARGET_DSSI
 DEFINES += HAVE_SUIL
 DEFINES += WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST
 DEFINES += WANT_FLUIDSYNTH WANT_LINUXSAMPLER