From c400c9ba4da6536248416c30f0a981b73528a0a2 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 1 Sep 2014 16:22:54 +0200 Subject: [PATCH] LadspaEffect/CALF: Clang compatibility fixes --- plugins/LadspaEffect/caps/SweepVF.cc | 8 +++++--- plugins/LadspaEffect/caps/dsp/ToneStack.h | 7 ------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/plugins/LadspaEffect/caps/SweepVF.cc b/plugins/LadspaEffect/caps/SweepVF.cc index 95921c258..f97c220cf 100644 --- a/plugins/LadspaEffect/caps/SweepVF.cc +++ b/plugins/LadspaEffect/caps/SweepVF.cc @@ -28,6 +28,8 @@ 02111-1307, USA or point your web browser to http://www.gnu.org. */ +#include + #include "basics.h" #include "SweepVF.h" @@ -85,7 +87,7 @@ SweepVFI::one_cycle (int frames) modulation *= scale * f; svf.set_f_Q (max (.001, f + modulation), Q); - int n = min (frames, BLOCK_SIZE); + int n = std::min (frames, BLOCK_SIZE); for (int i = 0; i < n; ++i) F (d, i, svf.process (s[i] + normal), adding_gain); @@ -231,7 +233,7 @@ SweepVFII::one_cycle (int frames) svf.set_f_Q (max (.001, f + modulation1), q); - int n = min (frames, BLOCK_SIZE); + int n = std::min (frames, BLOCK_SIZE); for (int i = 0; i < n; ++i) F (d, i, svf.process (s[i] + normal), adding_gain); @@ -385,7 +387,7 @@ AutoWah::one_cycle (int frames) m *= scale * .08; svf.set_f_Q (max (.001, f + m), Q); - int n = min (frames, BLOCK_SIZE); + int n = std::min (frames, BLOCK_SIZE); for (int i = 0; i < n; ++i) { diff --git a/plugins/LadspaEffect/caps/dsp/ToneStack.h b/plugins/LadspaEffect/caps/dsp/ToneStack.h index ef85d2057..4d0600856 100644 --- a/plugins/LadspaEffect/caps/dsp/ToneStack.h +++ b/plugins/LadspaEffect/caps/dsp/ToneStack.h @@ -69,10 +69,7 @@ class ToneStack // digital coefficients double dcoef_a[Order + 1]; double dcoef_b[Order + 1]; - double af[Order + 1]; - double bf[Order + 1]; - double fs; TDFII filter; public: @@ -209,10 +206,6 @@ class ToneStackLT // digital coefficients double *kcoef; double *vcoef; - double af [Order + 1]; - double bf [Order + 1]; - - double fs; LatFilt filter; public: