diff --git a/.gitignore b/.gitignore index b86298c..1c96e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ carla-discovery-qtcreator carla-discovery-unix32 carla-discovery-unix64 c++/patchcanvas/PatchCanvas +carla-*-Release diff --git a/src/carla-backend/carla_backend_standalone.cpp b/src/carla-backend/carla_backend_standalone.cpp index 0951f97..5ca2b55 100644 --- a/src/carla-backend/carla_backend_standalone.cpp +++ b/src/carla-backend/carla_backend_standalone.cpp @@ -1148,8 +1148,6 @@ void set_option(CarlaBackend::OptionsType option, int value, const char* valueSt #ifdef QTCREATOR_TEST -#include "carla_lv2_includes.h" - #include #include diff --git a/src/carla-backend/dssi.cpp b/src/carla-backend/dssi.cpp index 52b620d..0fe7b78 100644 --- a/src/carla-backend/dssi.cpp +++ b/src/carla-backend/dssi.cpp @@ -16,8 +16,7 @@ */ #include "carla_plugin.h" - -#include "dssi/dssi.h" +#include "carla_dssi.h" CARLA_BACKEND_START_NAMESPACE diff --git a/src/carla-backend/fluidsynth.cpp b/src/carla-backend/fluidsynth.cpp index 564474a..baf0b75 100644 --- a/src/carla-backend/fluidsynth.cpp +++ b/src/carla-backend/fluidsynth.cpp @@ -21,6 +21,12 @@ #include "carla_plugin.h" +#ifdef WANT_FLUIDSYNTH +#include "carla_fluidsynth.h" +#else +#warning fluidsynth not available (no SF2 support) +#endif + CARLA_BACKEND_START_NAMESPACE #if 0 @@ -28,11 +34,6 @@ CARLA_BACKEND_START_NAMESPACE #endif #ifdef WANT_FLUIDSYNTH -#include - -#if (FLUIDSYNTH_VERSION_MAJOR >= 1 && FLUIDSYNTH_VERSION_MINOR >= 1 && FLUIDSYNTH_VERSION_MICRO >= 4) -#define FLUIDSYNTH_VERSION_NEW_API -#endif /*! * @defgroup CarlaBackendFluidSynthPlugin Carla Backend FluidSynth Plugin @@ -1281,8 +1282,6 @@ private: double param_buffers[FluidSynthParametersMax]; const char* m_label; }; -#else -#warning fluidsynth not available (no SF2 support) #endif // WANT_FLUIDSYNTH CarlaPlugin* CarlaPlugin::newSF2(const initializer& init) diff --git a/src/carla-backend/ladspa.cpp b/src/carla-backend/ladspa.cpp index 9db0085..4258430 100644 --- a/src/carla-backend/ladspa.cpp +++ b/src/carla-backend/ladspa.cpp @@ -16,7 +16,7 @@ */ #include "carla_plugin.h" -#include "carla_ladspa_includes.h" +#include "carla_ladspa.h" CARLA_BACKEND_START_NAMESPACE diff --git a/src/carla-backend/linuxsampler.cpp b/src/carla-backend/linuxsampler.cpp index 429d948..8c28ddc 100644 --- a/src/carla-backend/linuxsampler.cpp +++ b/src/carla-backend/linuxsampler.cpp @@ -24,8 +24,10 @@ #include "carla_plugin.h" #ifdef WANT_LINUXSAMPLER - -#include "carla_linuxsampler_includes.h" +#include "carla_linuxsampler.h" +#else +#warning linuxsampler not available (no GIG and SFZ support) +#endif #include @@ -35,6 +37,8 @@ CARLA_BACKEND_START_NAMESPACE } /* adjust editor indent */ #endif +#ifdef WANT_LINUXSAMPLER + /*! * @defgroup CarlaBackendLinuxSamplerPlugin Carla Backend LinuxSampler Plugin * @@ -42,6 +46,7 @@ CARLA_BACKEND_START_NAMESPACE * http://www.linuxsampler.org/ * @{ */ + class LinuxSamplerPlugin : public CarlaPlugin { public: @@ -593,37 +598,29 @@ CarlaPlugin* LinuxSamplerPlugin::newLinuxSampler(const initializer& init, bool i return plugin; } +#endif // WANT_LINUXSAMPLER CarlaPlugin* CarlaPlugin::newGIG(const initializer& init) { qDebug("CarlaPlugin::newGIG(%p, %s, %s, %s)", init.engine, init.filename, init.name, init.label); +#ifdef WANT_LINUXSAMPLER return LinuxSamplerPlugin::newLinuxSampler(init, true); -} - -CarlaPlugin* CarlaPlugin::newSFZ(const initializer& init) -{ - qDebug("CarlaPlugin::newSFZ(%p, %s, %s, %s)", init.engine, init.filename, init.name, init.label); - return LinuxSamplerPlugin::newLinuxSampler(init, false); -} -#else // WANT_LINUXSAMPLER -#warning linuxsampler not available (no GIG and SFZ support) - -CARLA_BACKEND_START_NAMESPACE - -CarlaPlugin* CarlaPlugin::newGIG(const initializer& init) -{ - qDebug("CarlaPlugin::newGIG(%p, %s, %s, %s)", init.engine, init.filename, init.name, init.label); +#else setLastError("linuxsampler support not available"); return nullptr; +#endif } CarlaPlugin* CarlaPlugin::newSFZ(const initializer& init) { qDebug("CarlaPlugin::newSFZ(%p, %s, %s, %s)", init.engine, init.filename, init.name, init.label); +#ifdef WANT_LINUXSAMPLER + return LinuxSamplerPlugin::newLinuxSampler(init, false); +#else setLastError("linuxsampler support not available"); return nullptr; -} #endif +} /**@}*/ diff --git a/src/carla-backend/lv2.cpp b/src/carla-backend/lv2.cpp index 63174b3..2f8c013 100644 --- a/src/carla-backend/lv2.cpp +++ b/src/carla-backend/lv2.cpp @@ -16,9 +16,7 @@ */ #include "carla_plugin.h" - -#include "carla_lv2_includes.h" -#include "sratom/sratom.h" +#include "carla_lv2.h" extern "C" { #include "lv2-rtmempool/rtmempool.h" diff --git a/src/carla-backend/qtcreator/carla-backend.pro b/src/carla-backend/qtcreator/carla-backend.pro index 8a9cc92..9b2f909 100644 --- a/src/carla-backend/qtcreator/carla-backend.pro +++ b/src/carla-backend/qtcreator/carla-backend.pro @@ -41,17 +41,18 @@ HEADERS = \ ../../carla-includes/carla_includes.h \ ../../carla-includes/carla_lib_includes.h \ ../../carla-includes/carla_osc_includes.h \ - ../../carla-includes/carla_ladspa_includes.h \ - ../../carla-includes/carla_lv2_includes.h \ - ../../carla-includes/carla_vst_includes.h \ - ../../carla-includes/carla_linuxsampler_includes.h \ + ../../carla-includes/carla_ladspa.h \ + ../../carla-includes/carla_dssi.h \ + ../../carla-includes/carla_lv2.h \ + ../../carla-includes/carla_vst.h \ + ../../carla-includes/carla_fluidsynth.h \ + ../../carla-includes/carla_linuxsampler.h \ ../../carla-includes/carla_midi.h \ ../../carla-includes/ladspa_rdf.h \ ../../carla-includes/lv2_rdf.h INCLUDEPATH = .. \ - ../../carla-includes \ - ../../carla-includes/vst + ../../carla-includes DEFINES += DEBUG DEFINES += CARLA_ENGINE_JACK diff --git a/src/carla-backend/vst.cpp b/src/carla-backend/vst.cpp index 33e4416..a0f13cc 100644 --- a/src/carla-backend/vst.cpp +++ b/src/carla-backend/vst.cpp @@ -16,7 +16,7 @@ */ #include "carla_plugin.h" -#include "carla_vst_includes.h" +#include "carla_vst.h" #ifndef __WINE__ #include diff --git a/src/carla-bridge/qtcreator/carla-bridge-lv2-gtk2.pro b/src/carla-bridge/qtcreator/carla-bridge-lv2-gtk2.pro index b120804..e7ea15b 100644 --- a/src/carla-bridge/qtcreator/carla-bridge-lv2-gtk2.pro +++ b/src/carla-bridge/qtcreator/carla-bridge-lv2-gtk2.pro @@ -17,18 +17,20 @@ SOURCES = \ HEADERS = \ ../carla_bridge.h \ ../carla_bridge_osc.h \ - ../../carla-backend/carla_midi.h \ ../../carla-includes/carla_includes.h \ ../../carla-includes/carla_lib_includes.h \ ../../carla-includes/carla_osc_includes.h \ + ../../carla-includes/carla_lv2_includes.h \ + ../../carla-includes/carla_midi.h \ ../../carla-includes/lv2_rdf.h INCLUDEPATH = .. \ ../../carla-backend \ ../../carla-includes -DEFINES = BUILD_BRIDGE BUILD_BRIDGE_UI BRIDGE_LV2_GTK2 +LIBS = \ + ../../carla-lilv/carla_lilv.a -LIBS = ../../carla-lilv/carla_lilv.a -ldl +DEFINES = BUILD_BRIDGE BUILD_BRIDGE_UI BRIDGE_LV2_GTK2 QMAKE_CXXFLAGS *= -std=c++0x diff --git a/src/carla-discovery/Makefile b/src/carla-discovery/Makefile index 5c39ee8..a2a00f3 100644 --- a/src/carla-discovery/Makefile +++ b/src/carla-discovery/Makefile @@ -6,13 +6,14 @@ CXX ?= g++ WINECXX ?= wineg++ +STRIP ?= strip BASE_FLAGS = -O2 -ffast-math -fomit-frame-pointer -fPIC -mtune=generic -msse -Wall -I../carla-includes BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) BUILD_FLAGS += -I../carla-backend -I../carla-includes $(shell pkg-config --cflags QtCore) BUILD_FLAGS += -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -BUILD_FLAGS += -DVESTIGE_HEADER -I../carla-includes/vestige # Comment this line to not use vestige header +BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header 32BIT_FLAGS = -m32 64BIT_FLAGS = -m64 @@ -67,22 +68,22 @@ wine64: carla-discovery-win64.exe.so 64BIT_OBJS = carla-discovery.cpp ../carla-lilv/carla_lilv_64bit.a carla-discovery-unix32: $(32BIT_OBJS) - $(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && strip $@ + $(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && $(STRIP) $@ carla-discovery-unix64: $(64BIT_OBJS) - $(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && strip $@ + $(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && $(STRIP) $@ carla-discovery-win32.exe: $(32BIT_OBJS) - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ + $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ && $(STRIP) $@ carla-discovery-win64.exe: $(64BIT_OBJS) - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ + $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ && $(STRIP) $@ carla-discovery-win32.exe.so: $(32BIT_OBJS) - $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win32.exe && strip $@ + $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win32.exe && $(STRIP) $@ carla-discovery-win64.exe.so: $(64BIT_OBJS) - $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win64.exe && strip $@ + $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win64.exe && $(STRIP) $@ ../carla-lilv/carla_lilv_32bit.a: $(MAKE) -C ../carla-lilv 32bit diff --git a/src/carla-discovery/Makefile.dbg b/src/carla-discovery/Makefile.dbg index ae7034e..0902b8b 100644 --- a/src/carla-discovery/Makefile.dbg +++ b/src/carla-discovery/Makefile.dbg @@ -12,7 +12,7 @@ BASE_FLAGS = -O0 -g -Wall -I../carla-includes BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) BUILD_FLAGS += -I../carla-backend -I../carla-includes $(shell pkg-config --cflags QtCore) BUILD_FLAGS += -DDEBUG -BUILD_FLAGS += -DVESTIGE_HEADER -I../carla-includes/vestige # Comment this line to not use vestige header +BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header 32BIT_FLAGS = -m32 64BIT_FLAGS = -m64 diff --git a/src/carla-discovery/carla-discovery.cpp b/src/carla-discovery/carla-discovery.cpp index 92b3664..0086c80 100644 --- a/src/carla-discovery/carla-discovery.cpp +++ b/src/carla-discovery/carla-discovery.cpp @@ -27,18 +27,17 @@ #include #include -#include "carla_ladspa_includes.h" -#include "carla_lv2_includes.h" -#include "carla_vst_includes.h" - -#include "dssi/dssi.h" +#include "carla_ladspa.h" +#include "carla_dssi.h" +#include "carla_lv2.h" +#include "carla_vst.h" #ifdef BUILD_NATIVE # ifdef WANT_FLUIDSYNTH -# include +# include "carla_fluidsynth.h" # endif # ifdef WANT_LINUXSAMPLER -# include "carla_linuxsampler_includes.h" +# include "carla_linuxsampler.h" # endif #endif @@ -64,7 +63,7 @@ using namespace CarlaBackend; intptr_t VstCurrentUniqueId = 0; -intptr_t VstHostCallback(AEffect* effect, int32_t opcode, int32_t index, intptr_t value, void* ptr, float opt) +intptr_t VstHostCallback(AEffect* const effect, const int32_t opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt) { #if DEBUG qDebug("VstHostCallback(%p, opcode: %s, index: %i, value: " P_INTPTR ", opt: %f", effect, VstMasterOpcode2str(opcode), index, value, opt); @@ -409,7 +408,7 @@ void do_dssi_check(void* const lib_handle, const bool init) continue; } - // we can only get program list per-handle + // we can only get program info per-handle if (descriptor->get_program) { while ((descriptor->get_program(handle, programsTotal++))) @@ -710,31 +709,31 @@ void do_vst_check(void* const lib_handle, const bool init) if (effect && effect->magic == kEffectMagic) { - const char* c_name; - const char* c_product; - const char* c_vendor; + const char* cName; + const char* cProduct; + const char* cVendor; char strBuf[255] = { 0 }; effect->dispatcher(effect, effGetEffectName, 0, 0, strBuf, 0.0f); - c_name = strdup((strBuf[0] != 0) ? strBuf : ""); + cName = strdup((strBuf[0] != 0) ? strBuf : ""); strBuf[0] = 0; effect->dispatcher(effect, effGetProductString, 0, 0, strBuf, 0.0f); - c_product = strdup((strBuf[0] != 0) ? strBuf : ""); + cProduct = strdup((strBuf[0] != 0) ? strBuf : ""); strBuf[0] = 0; effect->dispatcher(effect, effGetVendorString, 0, 0, strBuf, 0.0f); - c_vendor = strdup((strBuf[0] != 0) ? strBuf : ""); + cVendor = strdup((strBuf[0] != 0) ? strBuf : ""); VstCurrentUniqueId = effect->uniqueID; intptr_t VstCategory = effect->dispatcher(effect, effGetPlugCategory, 0, 0, nullptr, 0.0f); + // only init if required + if (init || VstCategory == kPlugCategShell) + effect->dispatcher(effect, effOpen, 0, 0, nullptr, 0.0f); + while (true) { - // only init if required - if (init || VstCategory == kPlugCategShell) - effect->dispatcher(effect, effOpen, 0, 0, nullptr, 0.0f); - int hints = 0; int audioIns = effect->numInputs; int audioOuts = effect->numOutputs; @@ -838,15 +837,11 @@ void do_vst_check(void* const lib_handle, const bool init) // end crash-free plugin test // ----------------------------------------------------------------------- - // only close if required - if (init || VstCategory == kPlugCategShell) - effect->dispatcher(effect, effClose, 0, 0, nullptr, 0.0f); - DISCOVERY_OUT("init", "-----------"); - DISCOVERY_OUT("name", c_name); - DISCOVERY_OUT("label", c_product); - DISCOVERY_OUT("maker", c_vendor); - DISCOVERY_OUT("copyright", c_vendor); + DISCOVERY_OUT("name", cName); + DISCOVERY_OUT("label", cProduct); + DISCOVERY_OUT("maker", cVendor); + DISCOVERY_OUT("copyright", cVendor); DISCOVERY_OUT("unique_id", VstCurrentUniqueId); DISCOVERY_OUT("hints", hints); DISCOVERY_OUT("audio.ins", audioIns); @@ -861,26 +856,28 @@ void do_vst_check(void* const lib_handle, const bool init) DISCOVERY_OUT("build", BINARY_NATIVE); DISCOVERY_OUT("end", "------------"); - if (VstCategory == kPlugCategShell) - { - strBuf[0] = 0; - VstCurrentUniqueId = effect->dispatcher(effect, effShellGetNextPlugin, 0, 0, strBuf, 0.0f); + if (VstCategory != kPlugCategShell) + break; - if (VstCurrentUniqueId != 0) - { - free((void*)c_name); - c_name = strdup((strBuf[0] != 0) ? strBuf : ""); - } - else - break; + strBuf[0] = 0; + VstCurrentUniqueId = effect->dispatcher(effect, effShellGetNextPlugin, 0, 0, strBuf, 0.0f); + + if (VstCurrentUniqueId != 0) + { + free((void*)cName); + cName = strdup((strBuf[0] != 0) ? strBuf : ""); } else break; } - free((void*)c_name); - free((void*)c_product); - free((void*)c_vendor); + // only close if required + if (init || VstCategory == kPlugCategShell) + effect->dispatcher(effect, effClose, 0, 0, nullptr, 0.0f); + + free((void*)cName); + free((void*)cProduct); + free((void*)cVendor); } else DISCOVERY_OUT("error", "Failed to init VST plugin"); @@ -947,7 +944,7 @@ void do_fluidsynth_check(const char* const filename, const bool init) void do_linuxsampler_check(const char* const filename, const char* const stype, const bool init) { #ifdef WANT_LINUXSAMPLER - QFileInfo file(filename); + const QFileInfo file(filename); if (! file.exists()) { @@ -971,12 +968,12 @@ void do_linuxsampler_check(const char* const filename, const char* const stype, class LinuxSamplerScopedEngine { public: - LinuxSamplerScopedEngine(const char* filename, const char* stype) + LinuxSamplerScopedEngine(const char* const filename, const char* const stype) { try { engine = EngineFactory::Create(stype); } - catch (Exception& e) + catch (const Exception& e) { DISCOVERY_OUT("error", e.what()); return; @@ -985,7 +982,7 @@ void do_linuxsampler_check(const char* const filename, const char* const stype, try { ins = engine->GetInstrumentManager(); } - catch (Exception& e) + catch (const Exception& e) { DISCOVERY_OUT("error", e.what()); return; @@ -996,7 +993,7 @@ void do_linuxsampler_check(const char* const filename, const char* const stype, try { ids = ins->GetInstrumentFileContent(filename); } - catch (Exception& e) + catch (const Exception& e) { DISCOVERY_OUT("error", e.what()); return; diff --git a/src/carla-discovery/qtcreator/carla-discovery.pro b/src/carla-discovery/qtcreator/carla-discovery.pro index 0c8a313..8c91b4f 100644 --- a/src/carla-discovery/qtcreator/carla-discovery.pro +++ b/src/carla-discovery/qtcreator/carla-discovery.pro @@ -2,7 +2,7 @@ QT = core -CONFIG = link_pkgconfig qt warn_on debug +CONFIG = debug link_pkgconfig qt warn_on DEFINES = DEBUG BUILD_NATIVE WANT_FLUIDSYNTH WANT_LINUXSAMPLER PKGCONFIG = fluidsynth linuxsampler @@ -16,18 +16,20 @@ SOURCES = \ HEADERS = \ ../../carla-includes/carla_includes.h \ ../../carla-includes/carla_lib_includes.h \ - ../../carla-includes/carla_vst_includes.h \ - ../../carla-includes/carla_ladspa_includes.h \ - ../../carla-includes/carla_lv2_includes.h \ - ../../carla-includes/carla_vst_includes.h \ - ../../carla-includes/carla_linuxsampler_includes.h \ + ../../carla-includes/carla_ladspa.h \ + ../../carla-includes/carla_dssi.h \ + ../../carla-includes/carla_lv2.h \ + ../../carla-includes/carla_vst.h \ + ../../carla-includes/carla_fluidsynth.h \ + ../../carla-includes/carla_linuxsampler.h \ + ../../carla-includes/ladspa_rdf.h \ ../../carla-includes/lv2_rdf.h INCLUDEPATH = .. \ ../../carla-backend \ - ../../carla-includes \ - ../../carla-includes/vst + ../../carla-includes -LIBS = ../../carla-lilv/carla_lilv.a -ldl +LIBS = \ + ../../carla-lilv/carla_lilv.a QMAKE_CXXFLAGS *= -std=c++0x diff --git a/src/carla-includes/carla_dssi.h b/src/carla-includes/carla_dssi.h new file mode 100644 index 0000000..c98a0af --- /dev/null +++ b/src/carla-includes/carla_dssi.h @@ -0,0 +1,24 @@ +/* + * Carla common DSSI code + * Copyright (C) 2012 Filipe Coelho + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * For a full copy of the GNU General Public License see the COPYING file + */ + +#ifndef CARLA_DSSI_INCLUDES_H +#define CARLA_DSSI_INCLUDES_H + +#include "carla_ladspa.h" +#include "dssi/dssi.h" + +#endif // CARLA_DSSI_INCLUDES_H diff --git a/src/carla-includes/carla_fluidsynth.h b/src/carla-includes/carla_fluidsynth.h new file mode 100644 index 0000000..633f611 --- /dev/null +++ b/src/carla-includes/carla_fluidsynth.h @@ -0,0 +1,27 @@ +/* + * Carla common FluidSynth code + * Copyright (C) 2012 Filipe Coelho + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * For a full copy of the GNU General Public License see the COPYING file + */ + +#ifndef CARLA_FLUIDSYNTH_INCLUDES_H +#define CARLA_FLUIDSYNTH_INCLUDES_H + +#include + +#if (FLUIDSYNTH_VERSION_MAJOR >= 1 && FLUIDSYNTH_VERSION_MINOR >= 1 && FLUIDSYNTH_VERSION_MICRO >= 4) +# define FLUIDSYNTH_VERSION_NEW_API +#endif + +#endif // CARLA_FLUIDSYNTH_INCLUDES_H diff --git a/src/carla-includes/carla_includes.h b/src/carla-includes/carla_includes.h index 9a7183d..afae052 100644 --- a/src/carla-includes/carla_includes.h +++ b/src/carla-includes/carla_includes.h @@ -19,12 +19,12 @@ #define CARLA_INCLUDES_H #ifdef __WINE__ -#define __socklen_t_defined -#define __WINE_WINSOCK2__ -#define HRESULT LONG -#define Q_CORE_EXPORT -#define Q_GUI_EXPORT -#define QT_NO_STL +# define __socklen_t_defined +# define __WINE_WINSOCK2__ +# define HRESULT LONG +# define Q_CORE_EXPORT +# define Q_GUI_EXPORT +# define QT_NO_STL #endif #include diff --git a/src/carla-includes/carla_ladspa_includes.h b/src/carla-includes/carla_ladspa.h similarity index 100% rename from src/carla-includes/carla_ladspa_includes.h rename to src/carla-includes/carla_ladspa.h diff --git a/src/carla-includes/carla_linuxsampler_includes.h b/src/carla-includes/carla_linuxsampler.h similarity index 97% rename from src/carla-includes/carla_linuxsampler_includes.h rename to src/carla-includes/carla_linuxsampler.h index d6ad903..6dd2866 100644 --- a/src/carla-includes/carla_linuxsampler_includes.h +++ b/src/carla-includes/carla_linuxsampler.h @@ -40,7 +40,7 @@ protected: friend class Engine; }; -#if ! (defined(BUILD_BRIDGE) || defined(BUILD_NATIVE)) +#ifndef BUILD_NATIVE #include "carla_plugin.h" @@ -155,7 +155,7 @@ public: } }; -#endif // BUILD_BRIDGE || BUILD_NATIVE +#endif // ! BUILD_NATIVE } // namespace LinuxSampler diff --git a/src/carla-includes/carla_lv2_includes.h b/src/carla-includes/carla_lv2.h similarity index 99% rename from src/carla-includes/carla_lv2_includes.h rename to src/carla-includes/carla_lv2.h index 18757ba..010b4e9 100644 --- a/src/carla-includes/carla_lv2_includes.h +++ b/src/carla-includes/carla_lv2.h @@ -51,6 +51,7 @@ #include "lv2_rdf.h" #include "lilv/lilvmm.hpp" +#include "sratom/sratom.h" #include #include diff --git a/src/carla-includes/carla_vst_includes.h b/src/carla-includes/carla_vst.h similarity index 99% rename from src/carla-includes/carla_vst_includes.h rename to src/carla-includes/carla_vst.h index ca52900..5189ab0 100644 --- a/src/carla-includes/carla_vst_includes.h +++ b/src/carla-includes/carla_vst.h @@ -20,10 +20,8 @@ #include -#define VST_FORCE_DEPRECATED 0 -#include "aeffectx.h" - #if VESTIGE_HEADER +#include "vestige/aeffectx.h" #define audioMasterGetOutputSpeakerArrangement audioMasterGetSpeakerArrangement #define effFlagsProgramChunks (1 << 5) #define effSetProgramName 4 @@ -106,6 +104,8 @@ struct VstTimeInfo_R { int32_t timeSigNumerator, timeSigDenominator, smpteOffset, smpteFrameRate, samplesToNextClock, flags; }; #else +#define VST_FORCE_DEPRECATED 0 +#include "vst/aeffectx.h" typedef VstTimeInfo VstTimeInfo_R; #endif