LadspaEffect/CALF: Clang compatibility fixes

This commit is contained in:
Tobias Doerffel
2014-09-01 16:22:54 +02:00
parent 0ef3d6c1f6
commit c400c9ba4d
2 changed files with 5 additions and 10 deletions

View File

@@ -28,6 +28,8 @@
02111-1307, USA or point your web browser to http://www.gnu.org.
*/
#include <algorithm>
#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<int> (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<int> (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<int> (frames, BLOCK_SIZE);
for (int i = 0; i < n; ++i)
{

View File

@@ -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<Order> 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<Order> filter;
public: