From 45a2d5b0a268180b4304ce27f22abbd3f8d5073c Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 28 May 2022 03:00:08 +0100 Subject: [PATCH] Allow to build with custom dpf path Signed-off-by: falkTX --- Makefile.mk | 8 ++++++++ distrho-3bandeq/DistrhoPlugin3BandEQ.cpp | 2 +- distrho-3bandeq/DistrhoPlugin3BandEQ.hpp | 2 +- distrho-3bandsplitter/DistrhoPlugin3BandSplitter.cpp | 2 +- distrho-3bandsplitter/DistrhoPlugin3BandSplitter.hpp | 2 +- distrho-kars/DistrhoPluginKars.cpp | 2 +- distrho-kars/DistrhoPluginKars.hpp | 2 +- distrho-nekobi/DistrhoPluginNekobi.cpp | 2 +- distrho-nekobi/DistrhoPluginNekobi.hpp | 2 +- distrho-pingpongpan/DistrhoPluginPingPongPan.cpp | 2 +- distrho-pingpongpan/DistrhoPluginPingPongPan.hpp | 2 +- distrho-vectorjuice/VectorJuicePlugin.cpp | 2 +- distrho-vectorjuice/VectorJuicePlugin.hpp | 2 +- distrho-wobblejuice/WobbleJuicePlugin.cpp | 2 +- distrho-wobblejuice/WobbleJuicePlugin.hpp | 2 +- 15 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Makefile.mk b/Makefile.mk index 1a404fb..fe23094 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -71,10 +71,18 @@ endif # --------------------------------------------------------------------------------------------------------------------- # Flags for DPF Plugins +ifeq ($(USING_CUSTOM_DPF),true) +DPF_FLAGS = -I$(CUSTOM_DPF_PATH)/distrho +else DPF_FLAGS = -I$(CWDE)/modules/distrho +endif ifeq ($(HAVE_DGL),true) +ifeq ($(USING_CUSTOM_DPF),true) +DPF_FLAGS += -I$(CUSTOM_DPF_PATH)/dgl +else DPF_FLAGS += -I$(CWDE)/modules/dgl +endif DPF_FLAGS += $(DGL_FLAGS) endif diff --git a/distrho-3bandeq/DistrhoPlugin3BandEQ.cpp b/distrho-3bandeq/DistrhoPlugin3BandEQ.cpp index c823c62..92ce595 100644 --- a/distrho-3bandeq/DistrhoPlugin3BandEQ.cpp +++ b/distrho-3bandeq/DistrhoPlugin3BandEQ.cpp @@ -223,7 +223,7 @@ void DistrhoPlugin3BandEQ::deactivate() tmp1LP = tmp2LP = tmp1HP = tmp2HP = 0.0f; } -void DistrhoPlugin3BandEQ::run(const float* const* inputs, float** outputs, uint32_t frames) +void DistrhoPlugin3BandEQ::run(const float** inputs, float** outputs, uint32_t frames) { const float* in1 = inputs[0]; const float* in2 = inputs[1]; diff --git a/distrho-3bandeq/DistrhoPlugin3BandEQ.hpp b/distrho-3bandeq/DistrhoPlugin3BandEQ.hpp index 8bff5ed..9ecda30 100644 --- a/distrho-3bandeq/DistrhoPlugin3BandEQ.hpp +++ b/distrho-3bandeq/DistrhoPlugin3BandEQ.hpp @@ -97,7 +97,7 @@ protected: void activate() override; void deactivate() override; - void run(const float* const* inputs, float** outputs, uint32_t frames) override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.cpp b/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.cpp index 9448f90..53ca45a 100644 --- a/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.cpp +++ b/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.cpp @@ -223,7 +223,7 @@ void DistrhoPlugin3BandSplitter::deactivate() tmp1LP = tmp2LP = tmp1HP = tmp2HP = 0.0f; } -void DistrhoPlugin3BandSplitter::run(const float* const* inputs, float** outputs, uint32_t frames) +void DistrhoPlugin3BandSplitter::run(const float** inputs, float** outputs, uint32_t frames) { const float* in1 = inputs[0]; const float* in2 = inputs[1]; diff --git a/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.hpp b/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.hpp index e8736f9..33f8ae4 100644 --- a/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.hpp +++ b/distrho-3bandsplitter/DistrhoPlugin3BandSplitter.hpp @@ -97,7 +97,7 @@ protected: void activate() override; void deactivate() override; - void run(const float* const* inputs, float** outputs, uint32_t frames) override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/distrho-kars/DistrhoPluginKars.cpp b/distrho-kars/DistrhoPluginKars.cpp index 1693b53..0ea466c 100644 --- a/distrho-kars/DistrhoPluginKars.cpp +++ b/distrho-kars/DistrhoPluginKars.cpp @@ -118,7 +118,7 @@ void DistrhoPluginKars::activate() } } -void DistrhoPluginKars::run(const float* const*, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) +void DistrhoPluginKars::run(const float**, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) { uint8_t note, velo; std::memset(outputs[0], 0, sizeof(float)*frames); diff --git a/distrho-kars/DistrhoPluginKars.hpp b/distrho-kars/DistrhoPluginKars.hpp index e2a7d03..e7010d3 100644 --- a/distrho-kars/DistrhoPluginKars.hpp +++ b/distrho-kars/DistrhoPluginKars.hpp @@ -93,7 +93,7 @@ protected: // Process void activate() override; - void run(const float* const*, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) override; + void run(const float**, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) override; // ------------------------------------------------------------------- diff --git a/distrho-nekobi/DistrhoPluginNekobi.cpp b/distrho-nekobi/DistrhoPluginNekobi.cpp index 6f6f732..8f4c96a 100644 --- a/distrho-nekobi/DistrhoPluginNekobi.cpp +++ b/distrho-nekobi/DistrhoPluginNekobi.cpp @@ -346,7 +346,7 @@ void DistrhoPluginNekobi::deactivate() nekobee_synth_all_voices_off(&fSynth); } -void DistrhoPluginNekobi::run(const float* const*, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) +void DistrhoPluginNekobi::run(const float**, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) { uint32_t framesDone = 0; uint32_t curEventIndex = 0; diff --git a/distrho-nekobi/DistrhoPluginNekobi.hpp b/distrho-nekobi/DistrhoPluginNekobi.hpp index 9e0bc1d..813d2fc 100644 --- a/distrho-nekobi/DistrhoPluginNekobi.hpp +++ b/distrho-nekobi/DistrhoPluginNekobi.hpp @@ -103,7 +103,7 @@ protected: void activate() override; void deactivate() override; - void run(const float* const*, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) override; + void run(const float**, float** outputs, uint32_t frames, const MidiEvent* midiEvents, uint32_t midiEventCount) override; // ------------------------------------------------------------------- diff --git a/distrho-pingpongpan/DistrhoPluginPingPongPan.cpp b/distrho-pingpongpan/DistrhoPluginPingPongPan.cpp index 5740e29..39f43e1 100644 --- a/distrho-pingpongpan/DistrhoPluginPingPongPan.cpp +++ b/distrho-pingpongpan/DistrhoPluginPingPongPan.cpp @@ -130,7 +130,7 @@ void DistrhoPluginPingPongPan::deactivate() wavePos = 0.0f; } -void DistrhoPluginPingPongPan::run(const float* const* inputs, float** outputs, uint32_t frames) +void DistrhoPluginPingPongPan::run(const float** inputs, float** outputs, uint32_t frames) { const float* in1 = inputs[0]; const float* in2 = inputs[1]; diff --git a/distrho-pingpongpan/DistrhoPluginPingPongPan.hpp b/distrho-pingpongpan/DistrhoPluginPingPongPan.hpp index 38a8e59..93055e4 100644 --- a/distrho-pingpongpan/DistrhoPluginPingPongPan.hpp +++ b/distrho-pingpongpan/DistrhoPluginPingPongPan.hpp @@ -93,7 +93,7 @@ protected: void activate() override; void deactivate() override; - void run(const float* const* inputs, float** outputs, uint32_t frames) override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/distrho-vectorjuice/VectorJuicePlugin.cpp b/distrho-vectorjuice/VectorJuicePlugin.cpp index f6b1a60..e72c7a3 100644 --- a/distrho-vectorjuice/VectorJuicePlugin.cpp +++ b/distrho-vectorjuice/VectorJuicePlugin.cpp @@ -349,7 +349,7 @@ void VectorJuicePlugin::activate() } } -void VectorJuicePlugin::run(const float* const* inputs, float** outputs, uint32_t frames) +void VectorJuicePlugin::run(const float** inputs, float** outputs, uint32_t frames) { float out1, out2, tX, tY; diff --git a/distrho-vectorjuice/VectorJuicePlugin.hpp b/distrho-vectorjuice/VectorJuicePlugin.hpp index 80b1580..4f98cfb 100644 --- a/distrho-vectorjuice/VectorJuicePlugin.hpp +++ b/distrho-vectorjuice/VectorJuicePlugin.hpp @@ -205,7 +205,7 @@ protected: // Process void activate() override; - void run(const float* const* inputs, float** outputs, uint32_t frames) override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // ------------------------------------------------------------------- diff --git a/distrho-wobblejuice/WobbleJuicePlugin.cpp b/distrho-wobblejuice/WobbleJuicePlugin.cpp index 8964833..f19864a 100644 --- a/distrho-wobblejuice/WobbleJuicePlugin.cpp +++ b/distrho-wobblejuice/WobbleJuicePlugin.cpp @@ -179,7 +179,7 @@ void WobbleJuicePlugin::activate() sinePos = 0.0; } -void WobbleJuicePlugin::run(const float* const* inputs, float** outputs, uint32_t frames) +void WobbleJuicePlugin::run(const float** inputs, float** outputs, uint32_t frames) { //fetch the timepos struct from host; const TimePosition& time(getTimePosition()); diff --git a/distrho-wobblejuice/WobbleJuicePlugin.hpp b/distrho-wobblejuice/WobbleJuicePlugin.hpp index 7af593d..d588ec3 100644 --- a/distrho-wobblejuice/WobbleJuicePlugin.hpp +++ b/distrho-wobblejuice/WobbleJuicePlugin.hpp @@ -121,7 +121,7 @@ protected: // Process void activate() override; - void run(const float* const* inputs, float** outputs, uint32_t frames) override; + void run(const float** inputs, float** outputs, uint32_t frames) override; // -------------------------------------------------------------------