falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 43 Activity
Browse Source

Adjust includes to allow custom DPF headers 

Signed-off-by: falkTX <falktx@falktx.com>
pull/1975/merge
falkTX 2 months ago
parent
bd96b7c403
commit
31c97d2118
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
45 changed files with 56 additions and 53 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -1
      source/Makefile.mk
  2. +1
    -1
      source/backend/CarlaHostImpl.hpp
  3. +2
    -2
      source/backend/CarlaStandalone.cpp
  4. +2
    -2
      source/backend/engine/CarlaEngineBridge.cpp
  5. +1
    -1
      source/backend/engine/CarlaEngineDummy.cpp
  6. +1
    -1
      source/backend/engine/CarlaEngineNative.cpp
  7. +1
    -1
      source/backend/engine/CarlaEngineOsc.hpp
  8. +2
    -2
      source/backend/plugin/CarlaPlugin.cpp
  9. +2
    -2
      source/backend/plugin/CarlaPluginBridge.cpp
  10. +1
    -1
      source/backend/plugin/CarlaPluginInternal.hpp
  11. +1
    -1
      source/backend/plugin/CarlaPluginLV2.cpp
  12. +1
    -1
      source/backend/utils/Information.cpp
  13. +1
    -1
      source/backend/utils/PluginDiscovery.cpp
  14. +1
    -1
      source/bridges-plugin/CarlaBridgePlugin.cpp
  15. +2
    -2
      source/bridges-ui/CarlaBridgeFormat.cpp
  16. +1
    -1
      source/bridges-ui/CarlaBridgeFormat.hpp
  17. +1
    -1
      source/bridges-ui/CarlaBridgeToolkitNative.cpp
  18. +1
    -1
      source/discovery/carla-discovery.cpp
  19. +1
    -1
      source/frontend/carla_frontend.cpp
  20. +1
    -1
      source/frontend/pluginlist/pluginlistdialog.cpp
  21. +1
    -1
      source/includes/CarlaNativePrograms.hpp
  22. +1
    -1
      source/libjack/libjack.cpp
  23. +1
    -1
      source/modules/sfzero/sfzero/SFZSample.h
  24. +1
    -1
      source/modules/water/containers/HashMap.h
  25. +1
    -1
      source/modules/water/containers/OwnedArray.h
  26. +1
    -1
      source/modules/water/files/DirectoryIterator.h
  27. +1
    -1
      source/modules/water/files/TemporaryFile.cpp
  28. +1
    -1
      source/modules/water/memory/SharedResourcePointer.h
  29. +1
    -1
      source/modules/water/threads/ChildProcess.cpp
  30. +1
    -1
      source/modules/water/threads/ChildProcess.h
  31. +1
    -1
      source/modules/water/xml/XmlDocument.h
  32. +1
    -1
      source/native-plugins/external
  33. +1
    -1
      source/plugin/carla-lv2-export.cpp
  34. +1
    -1
      source/plugin/carla-lv2-ui.cpp
  35. +1
    -1
      source/plugin/carla-lv2.cpp
  36. +1
    -1
      source/utils/CarlaBackendUtils.hpp
  37. +1
    -1
      source/utils/CarlaBinaryUtils.hpp
  38. +1
    -1
      source/utils/CarlaBridgeUtils.cpp
  39. +1
    -1
      source/utils/CarlaBridgeUtils.hpp
  40. +1
    -1
      source/utils/CarlaExternalUI.hpp
  41. +1
    -1
      source/utils/CarlaJsfxUtils.hpp
  42. +1
    -1
      source/utils/CarlaMacUtils.cpp
  43. +3
    -3
      source/utils/CarlaPipeUtils.cpp
  44. +1
    -1
      source/utils/CarlaRunner.hpp
  45. +2
    -2
      source/utils/CarlaThread.hpp

+ 4
- 1
source/Makefile.mk View File

@@ -182,8 +182,11 @@ BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
endif endif
endif endif


ifneq ($(USING_CUSTOM_DPF),true)
ifeq ($(USING_CUSTOM_DPF),true)
BASE_FLAGS += -I$(CUSTOM_DPF_PATH)/distrho
else
BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES
BASE_FLAGS += -I$(CWD)/modules/distrho
endif endif


ifeq ($(HAVE_FLUIDSYNTH),true) ifeq ($(HAVE_FLUIDSYNTH),true)


+ 1
- 1
source/backend/CarlaHostImpl.hpp View File

@@ -28,7 +28,7 @@
# define CARLA_CAN_USE_LOG_THREAD # define CARLA_CAN_USE_LOG_THREAD
# include "CarlaLogThread.hpp" # include "CarlaLogThread.hpp"
#else #else
# include "distrho/extra/String.hpp"
# include "extra/String.hpp"
#endif #endif


namespace CB = CARLA_BACKEND_NAMESPACE; namespace CB = CARLA_BACKEND_NAMESPACE;


+ 2
- 2
source/backend/CarlaStandalone.cpp View File

@@ -13,8 +13,8 @@
#include "CarlaBackendUtils.hpp" #include "CarlaBackendUtils.hpp"
#include "ThreadSafeFFTW.hpp" #include "ThreadSafeFFTW.hpp"


#include "distrho/extra/Base64.hpp"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/Base64.hpp"
#include "extra/ScopedPointer.hpp"


#include "water/files/File.h" #include "water/files/File.h"




+ 2
- 2
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -23,8 +23,8 @@
# include <xmmintrin.h> # include <xmmintrin.h>
#endif #endif


#include "distrho/extra/Base64.hpp"
#include "distrho/extra/Time.hpp"
#include "extra/Base64.hpp"
#include "extra/Time.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/misc/Time.h" #include "water/misc/Time.h"


+ 1
- 1
source/backend/engine/CarlaEngineDummy.cpp View File

@@ -5,7 +5,7 @@
#include "CarlaEngineInit.hpp" #include "CarlaEngineInit.hpp"
#include "CarlaEngineInternal.hpp" #include "CarlaEngineInternal.hpp"


#include "distrho/extra/Time.hpp"
#include "extra/Time.hpp"


CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE




+ 1
- 1
source/backend/engine/CarlaEngineNative.cpp View File

@@ -25,7 +25,7 @@
#include "CarlaNative.hpp" #include "CarlaNative.hpp"
#include "CarlaNativePlugin.h" #include "CarlaNativePlugin.h"


#include "distrho/extra/Base64.hpp"
#include "extra/Base64.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/streams/MemoryOutputStream.h" #include "water/streams/MemoryOutputStream.h"


+ 1
- 1
source/backend/engine/CarlaEngineOsc.hpp View File

@@ -13,7 +13,7 @@
#include "CarlaJuceUtils.hpp" #include "CarlaJuceUtils.hpp"
#include "CarlaOscUtils.hpp" #include "CarlaOscUtils.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


#define CARLA_ENGINE_OSC_HANDLE_ARGS const CarlaPluginPtr& plugin, \ #define CARLA_ENGINE_OSC_HANDLE_ARGS const CarlaPluginPtr& plugin, \
const int argc, const lo_arg* const* const argv, const char* const types const int argc, const lo_arg* const* const argv, const char* const types


+ 2
- 2
source/backend/plugin/CarlaPlugin.cpp View File

@@ -13,8 +13,8 @@


#include <ctime> #include <ctime>


#include "distrho/extra/Base64.hpp"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/Base64.hpp"
#include "extra/ScopedPointer.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/streams/MemoryOutputStream.h" #include "water/streams/MemoryOutputStream.h"


+ 2
- 2
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -16,8 +16,8 @@


#include <ctime> #include <ctime>


#include "distrho/extra/Base64.hpp"
#include "distrho/extra/Time.hpp"
#include "extra/Base64.hpp"
#include "extra/Time.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/misc/Time.h" #include "water/misc/Time.h"


+ 1
- 1
source/backend/plugin/CarlaPluginInternal.hpp View File

@@ -14,7 +14,7 @@
#include "CarlaMutex.hpp" #include "CarlaMutex.hpp"
#include "RtLinkedList.hpp" #include "RtLinkedList.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE




+ 1
- 1
source/backend/plugin/CarlaPluginLV2.cpp View File

@@ -17,7 +17,7 @@
#include "CarlaScopeUtils.hpp" #include "CarlaScopeUtils.hpp"
#include "Lv2AtomRingBuffer.hpp" #include "Lv2AtomRingBuffer.hpp"


#include "distrho/extra/Base64.hpp"
#include "extra/Base64.hpp"


#include "../modules/lilv/config/lilv_config.h" #include "../modules/lilv/config/lilv_config.h"




+ 1
- 1
source/backend/utils/Information.cpp View File

@@ -25,7 +25,7 @@
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"
#include "water/files/File.h" #include "water/files/File.h"


// ------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------


+ 1
- 1
source/backend/utils/PluginDiscovery.cpp View File

@@ -10,7 +10,7 @@
#include "CarlaScopeUtils.hpp" #include "CarlaScopeUtils.hpp"
#include "CarlaSha1Utils.hpp" #include "CarlaSha1Utils.hpp"


#include "distrho/extra/Time.hpp"
#include "extra/Time.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/files/FileInputStream.h" #include "water/files/FileInputStream.h"


+ 1
- 1
source/bridges-plugin/CarlaBridgePlugin.cpp View File

@@ -37,7 +37,7 @@
# include <X11/Xlib.h> # include <X11/Xlib.h>
#endif #endif


#include "distrho/extra/Sleep.hpp"
#include "extra/Sleep.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/misc/Time.h" #include "water/misc/Time.h"


+ 2
- 2
source/bridges-ui/CarlaBridgeFormat.cpp View File

@@ -8,8 +8,8 @@


#include "CarlaMIDI.h" #include "CarlaMIDI.h"


#include "distrho/extra/Base64.hpp"
#include "distrho/extra/Sleep.hpp"
#include "extra/Base64.hpp"
#include "extra/Sleep.hpp"


// needed for atom-util // needed for atom-util
#ifndef nullptr #ifndef nullptr


+ 1
- 1
source/bridges-ui/CarlaBridgeFormat.hpp View File

@@ -9,7 +9,7 @@
#include "CarlaLibUtils.hpp" #include "CarlaLibUtils.hpp"
#include "CarlaPipeUtils.hpp" #include "CarlaPipeUtils.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


#include "lv2/atom.h" #include "lv2/atom.h"
#include "lv2/urid.h" #include "lv2/urid.h"


+ 1
- 1
source/bridges-ui/CarlaBridgeToolkitNative.cpp View File

@@ -12,7 +12,7 @@
# include "CarlaMacUtils.hpp" # include "CarlaMacUtils.hpp"
#endif #endif


#include "distrho/extra/Sleep.hpp"
#include "extra/Sleep.hpp"


#if defined(HAVE_X11) && defined(BRIDGE_X11) #if defined(HAVE_X11) && defined(BRIDGE_X11)
# include <X11/Xlib.h> # include <X11/Xlib.h>


+ 1
- 1
source/discovery/carla-discovery.cpp View File

@@ -16,7 +16,7 @@
#include "CarlaVst3Utils.hpp" #include "CarlaVst3Utils.hpp"
#include "CarlaClapUtils.hpp" #include "CarlaClapUtils.hpp"


#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"


#ifndef BUILDING_CARLA_FOR_WINE #ifndef BUILDING_CARLA_FOR_WINE
# include "CarlaPipeUtils.cpp" # include "CarlaPipeUtils.cpp"


+ 1
- 1
source/frontend/carla_frontend.cpp View File

@@ -25,7 +25,7 @@ void carla_frontend_createAndExecAboutDialog(QWidget* const parent,
// jackappdialog // jackappdialog


#include "dialogs/jackappdialog.hpp" #include "dialogs/jackappdialog.hpp"
#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


const JackAppDialogResults* const JackAppDialogResults*
carla_frontend_createAndExecJackAppDialog(QWidget* const parent, const char* const projectFilename) carla_frontend_createAndExecJackAppDialog(QWidget* const parent, const char* const projectFilename)


+ 1
- 1
source/frontend/pluginlist/pluginlistdialog.cpp View File

@@ -32,7 +32,7 @@
#include "CarlaJuceUtils.hpp" #include "CarlaJuceUtils.hpp"
#include "CarlaUtils.h" #include "CarlaUtils.h"


#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"


#include <cstdlib> #include <cstdlib>




+ 1
- 1
source/includes/CarlaNativePrograms.hpp View File

@@ -9,7 +9,7 @@
#include "CarlaMathUtils.hpp" #include "CarlaMathUtils.hpp"
#include "CarlaMutex.hpp" #include "CarlaMutex.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


#include "water/files/File.h" #include "water/files/File.h"
#include "water/memory/SharedResourcePointer.h" #include "water/memory/SharedResourcePointer.h"


+ 1
- 1
source/libjack/libjack.cpp View File

@@ -6,7 +6,7 @@
#include "CarlaThread.hpp" #include "CarlaThread.hpp"
#include "CarlaJuceUtils.hpp" #include "CarlaJuceUtils.hpp"


#include "distrho/extra/Time.hpp"
#include "extra/Time.hpp"


#include <signal.h> #include <signal.h>
#include <sys/time.h> #include <sys/time.h>


+ 1
- 1
source/modules/sfzero/sfzero/SFZSample.h View File

@@ -9,7 +9,7 @@


#include "SFZCommon.h" #include "SFZCommon.h"


#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
#include "water/buffers/AudioSampleBuffer.h" #include "water/buffers/AudioSampleBuffer.h"
#include "water/files/File.h" #include "water/files/File.h"




+ 1
- 1
source/modules/water/containers/HashMap.h View File

@@ -29,7 +29,7 @@
#include "Array.h" #include "Array.h"
#include "../text/String.h" #include "../text/String.h"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/containers/OwnedArray.h View File

@@ -28,7 +28,7 @@
#include "ArrayAllocationBase.h" #include "ArrayAllocationBase.h"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/files/DirectoryIterator.h View File

@@ -29,7 +29,7 @@
#include "File.h" #include "File.h"
#include "../text/StringArray.h" #include "../text/StringArray.h"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/files/TemporaryFile.cpp View File

@@ -26,7 +26,7 @@
#include "TemporaryFile.h" #include "TemporaryFile.h"
#include "../maths/Random.h" #include "../maths/Random.h"
#include "distrho/extra/Sleep.hpp"
#include "extra/Sleep.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/memory/SharedResourcePointer.h View File

@@ -29,7 +29,7 @@
#include "ReferenceCountedObject.h" #include "ReferenceCountedObject.h"
#include "../threads/SpinLock.h" #include "../threads/SpinLock.h"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/threads/ChildProcess.cpp View File

@@ -39,7 +39,7 @@
#include "CarlaProcessUtils.hpp" #include "CarlaProcessUtils.hpp"
#include "distrho/extra/Sleep.hpp"
#include "extra/Sleep.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/threads/ChildProcess.h View File

@@ -28,7 +28,7 @@
#include "../text/StringArray.h" #include "../text/StringArray.h"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
namespace water { namespace water {


+ 1
- 1
source/modules/water/xml/XmlDocument.h View File

@@ -28,7 +28,7 @@
#include "../text/StringArray.h" #include "../text/StringArray.h"
#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"
namespace water { namespace water {


+ 1
- 1
source/native-plugins/external

@@ -1 +1 @@
Subproject commit d5b1e35ba585f2f8b78d0b13505894a2c233136c
Subproject commit d53b62e9b948c26494ff9f43ce611110ce0ef4c7

+ 1
- 1
source/plugin/carla-lv2-export.cpp View File

@@ -22,7 +22,7 @@
#include "lv2/lv2_external_ui.h" #include "lv2/lv2_external_ui.h"
#include "lv2/lv2_programs.h" #include "lv2/lv2_programs.h"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"
#include "water/files/File.h" #include "water/files/File.h"
#include "water/text/StringArray.h" #include "water/text/StringArray.h"




+ 1
- 1
source/plugin/carla-lv2-ui.cpp View File

@@ -8,7 +8,7 @@
#include "CarlaLv2Utils.hpp" #include "CarlaLv2Utils.hpp"
#include "CarlaPipeUtils.hpp" #include "CarlaPipeUtils.hpp"


#include "distrho/extra/ScopedSafeLocale.hpp"
#include "extra/ScopedSafeLocale.hpp"


// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------




+ 1
- 1
source/plugin/carla-lv2.cpp View File

@@ -8,7 +8,7 @@
#include "CarlaMathUtils.hpp" #include "CarlaMathUtils.hpp"
#include "CarlaPipeUtils.hpp" #include "CarlaPipeUtils.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"
#include "water/files/File.h" #include "water/files/File.h"


static const char* const kPathForCarlaFiles = "carlafiles"; static const char* const kPathForCarlaFiles = "carlafiles";


+ 1
- 1
source/utils/CarlaBackendUtils.hpp View File

@@ -8,7 +8,7 @@
#include "CarlaNative.h" #include "CarlaNative.h"
#include "CarlaUtils.hpp" #include "CarlaUtils.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE




+ 1
- 1
source/utils/CarlaBinaryUtils.hpp View File

@@ -6,7 +6,7 @@


#include "CarlaBackend.h" #include "CarlaBackend.h"


#include "distrho/extra/ScopedPointer.hpp"
#include "extra/ScopedPointer.hpp"


#if defined(BUILDING_CARLA) #if defined(BUILDING_CARLA)
# include "water/files/FileInputStream.h" # include "water/files/FileInputStream.h"


+ 1
- 1
source/utils/CarlaBridgeUtils.cpp View File

@@ -4,7 +4,7 @@
#include "CarlaBridgeUtils.hpp" #include "CarlaBridgeUtils.hpp"
#include "CarlaShmUtils.hpp" #include "CarlaShmUtils.hpp"


#include "distrho/extra/Sleep.hpp"
#include "extra/Sleep.hpp"


// must be last // must be last
#include "jackbridge/JackBridge.hpp" #include "jackbridge/JackBridge.hpp"


+ 1
- 1
source/utils/CarlaBridgeUtils.hpp View File

@@ -8,7 +8,7 @@
#include "CarlaMutex.hpp" #include "CarlaMutex.hpp"
#include "CarlaRingBuffer.hpp" #include "CarlaRingBuffer.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


// ------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------




+ 1
- 1
source/utils/CarlaExternalUI.hpp View File

@@ -6,7 +6,7 @@


#include "CarlaPipeUtils.hpp" #include "CarlaPipeUtils.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------




+ 1
- 1
source/utils/CarlaJsfxUtils.hpp View File

@@ -7,7 +7,7 @@


#include "CarlaBackend.h" #include "CarlaBackend.h"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"
#include "water/files/File.h" #include "water/files/File.h"


#ifdef YSFX_API #ifdef YSFX_API


+ 1
- 1
source/utils/CarlaMacUtils.cpp View File

@@ -7,7 +7,7 @@


#include "CarlaMacUtils.hpp" #include "CarlaMacUtils.hpp"


#include "distrho/extra/String.hpp"
#include "extra/String.hpp"


#include <sys/xattr.h> #include <sys/xattr.h>




+ 3
- 3
source/utils/CarlaPipeUtils.cpp View File

@@ -6,9 +6,9 @@
#include "CarlaScopeUtils.hpp" #include "CarlaScopeUtils.hpp"
#include "CarlaMIDI.h" #include "CarlaMIDI.h"


#include "distrho/extra/Sleep.hpp"
#include "distrho/extra/String.hpp"
#include "distrho/extra/Time.hpp"
#include "extra/Sleep.hpp"
#include "extra/String.hpp"
#include "extra/Time.hpp"


// needed for atom-util // needed for atom-util
#ifndef nullptr #ifndef nullptr


+ 1
- 1
source/utils/CarlaRunner.hpp View File

@@ -9,7 +9,7 @@
#ifndef CARLA_OS_WASM #ifndef CARLA_OS_WASM
# include "CarlaThread.hpp" # include "CarlaThread.hpp"
#else #else
# include "distrho/extra/String.hpp"
# include "extra/String.hpp"
# include <emscripten/html5.h> # include <emscripten/html5.h>
#endif #endif




+ 2
- 2
source/utils/CarlaThread.hpp View File

@@ -6,8 +6,8 @@


#include "CarlaMutex.hpp" #include "CarlaMutex.hpp"
#include "CarlaProcessUtils.hpp" #include "CarlaProcessUtils.hpp"
#include "distrho/extra/Sleep.hpp"
#include "distrho/extra/String.hpp"
#include "extra/Sleep.hpp"
#include "extra/String.hpp"


#ifdef CARLA_OS_WASM #ifdef CARLA_OS_WASM
# error Threads do not work under wasm! # error Threads do not work under wasm!


Write Preview
Loading…
Cancel
Save