From a1af959b9fd45b1fbb6d9bbbe7d23431a6556b3a Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 21 Sep 2012 05:10:31 +0100 Subject: [PATCH] Carla: Initial support for native,internal plugins --- c++/carla-backend/carla_plugin.h | 14 ++++---------- c++/carla-backend/qtcreator/carla-backend.pro | 10 +++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/c++/carla-backend/carla_plugin.h b/c++/carla-backend/carla_plugin.h index b6d28c4..5de411c 100644 --- a/c++/carla-backend/carla_plugin.h +++ b/c++/carla-backend/carla_plugin.h @@ -1860,7 +1860,7 @@ public: virtual void uiParameterChange(const uint32_t index, const double value) { Q_ASSERT(index < param.count); - Q_UNUSED(index); + Q_UNUSED(value); } @@ -1870,7 +1870,6 @@ public: virtual void uiProgramChange(const uint32_t index) { Q_ASSERT(index < prog.count); - Q_UNUSED(index); } /*! @@ -1879,7 +1878,6 @@ public: virtual void uiMidiProgramChange(const uint32_t index) { Q_ASSERT(index < midiprog.count); - Q_UNUSED(index); } /*! @@ -1890,10 +1888,6 @@ public: Q_ASSERT(channel < 16); Q_ASSERT(note < 128); Q_ASSERT(velo > 0 && velo < 128); - - Q_UNUSED(channel); - Q_UNUSED(note); - Q_UNUSED(velo); } /*! @@ -1903,9 +1897,6 @@ public: { Q_ASSERT(channel < 16); Q_ASSERT(note < 128); - - Q_UNUSED(channel); - Q_UNUSED(note); } // ------------------------------------------------------------------- @@ -2114,6 +2105,9 @@ public: #ifndef BUILD_BRIDGE static CarlaPlugin* newBridge(const initializer& init, const BinaryType btype, const PluginType ptype); #endif + static CarlaPlugin* newNative(const initializer& init); + + static size_t getNativePluginCount(); // ------------------------------------------------------------------- diff --git a/c++/carla-backend/qtcreator/carla-backend.pro b/c++/carla-backend/qtcreator/carla-backend.pro index b6bf1f3..560928c 100644 --- a/c++/carla-backend/qtcreator/carla-backend.pro +++ b/c++/carla-backend/qtcreator/carla-backend.pro @@ -13,13 +13,14 @@ TARGET = carla_backend TEMPLATE = lib # app VERSION = 0.5.0 -SOURCES = \ +SOURCES = \ ../carla_backend_standalone.cpp \ # ../carla_backend_lv2.cpp \ ../carla_bridge.cpp \ ../carla_engine.cpp \ ../carla_engine_jack.cpp \ ../carla_engine_rtaudio.cpp \ + ../carla_native.cpp \ ../carla_osc.cpp \ ../carla_shared.cpp \ ../carla_threads.cpp \ @@ -31,6 +32,10 @@ SOURCES = \ ../linuxsampler.cpp \ ../../carla-jackbridge/carla_jackbridge.cpp +SOURCES += \ + ../plugins/bypass.c \ + ../plugins/midi-split.cpp + HEADERS = \ ../carla_backend.h \ ../carla_backend_standalone.h \ @@ -39,6 +44,8 @@ HEADERS = \ ../carla_plugin.h \ ../carla_shared.h \ ../carla_threads.h \ + ../plugins/carla_native.h \ + ../plugins/carla_nativemm.h \ ../../carla-jackbridge/carla_jackbridge.h \ ../../carla-includes/carla_includes.h \ ../../carla-includes/carla_lib_includes.h \ @@ -77,4 +84,5 @@ INCLUDEPATH += ../rtmidi-2.0.0 SOURCES += ../rtaudio-4.0.11/RtAudio.cpp SOURCES += ../rtmidi-2.0.0/RtMidi.cpp +QMAKE_CFLAGS *= -fPIC -std=c99 QMAKE_CXXFLAGS *= -fPIC -std=c++0x