From feeb907835c33ec49308a32449dc0b6d07285e2a Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Thu, 9 Jan 2003 04:37:24 +0000 Subject: "" svn path=/trunk/; revision=329 --- externals/grill/fftease/src/burrow~.cpp | 6 +++--- externals/grill/fftease/src/convert_new.c | 5 +++-- externals/grill/fftease/src/cross~.cpp | 6 +++--- externals/grill/fftease/src/dentist~.cpp | 6 +++--- externals/grill/fftease/src/disarray~.cpp | 6 +++--- externals/grill/fftease/src/drown~.cpp | 6 +++--- externals/grill/fftease/src/ether~.cpp | 8 ++++---- externals/grill/fftease/src/fft.c | 2 +- externals/grill/fftease/src/pv.h | 13 +++++++------ 9 files changed, 30 insertions(+), 28 deletions(-) (limited to 'externals/grill/fftease/src') diff --git a/externals/grill/fftease/src/burrow~.cpp b/externals/grill/fftease/src/burrow~.cpp index aef5e7aa..d868cbb8 100644 --- a/externals/grill/fftease/src/burrow~.cpp +++ b/externals/grill/fftease/src/burrow~.cpp @@ -142,9 +142,9 @@ V burrow::Delete() -V burrow::m_dsp(I n,S *const *in,S *const *out) +V burrow::m_dsp(I n,S *const *,S *const *) { - const I _D = Blocksize(); + const I _D = n; if(_D != blsz) { blsz = _D; @@ -181,7 +181,7 @@ V burrow::m_signal(I n,S *const *in,S *const *out) { /* declare working variables */ I i, j; - const I _D = blsz,_N = _D*_MULT_,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; + const I _D = n,_N = _D*_MULT_,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; /* fill our retaining buffers */ _inCount += _D; diff --git a/externals/grill/fftease/src/convert_new.c b/externals/grill/fftease/src/convert_new.c index 5df717f8..5bf7e9a7 100644 --- a/externals/grill/fftease/src/convert_new.c +++ b/externals/grill/fftease/src/convert_new.c @@ -1,6 +1,7 @@ -#include "pv.h" // T.Grill +/* T.Grill */ +#include "pv.h" -// #include +/* #include */ #include diff --git a/externals/grill/fftease/src/cross~.cpp b/externals/grill/fftease/src/cross~.cpp index 52874127..0eb19c02 100644 --- a/externals/grill/fftease/src/cross~.cpp +++ b/externals/grill/fftease/src/cross~.cpp @@ -115,9 +115,9 @@ V cross::Delete() -V cross::m_dsp(I n,S *const *in,S *const *out) +V cross::m_dsp(I n,S *const *,S *const *) { - const I _D = Blocksize(); + const I _D = n; const F _R = Samplerate(); if(_D != blsz || _R != smprt) { @@ -169,7 +169,7 @@ V cross::m_signal(I n,S *const *in,S *const *out) { /* declare working variables */ I i, j; - const I _D = blsz,_N = _D*_MULT_,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; + const I _D = n,_N = _D*_MULT_,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; _inCount += _D; diff --git a/externals/grill/fftease/src/dentist~.cpp b/externals/grill/fftease/src/dentist~.cpp index 8c9a0379..808796bd 100644 --- a/externals/grill/fftease/src/dentist~.cpp +++ b/externals/grill/fftease/src/dentist~.cpp @@ -166,9 +166,9 @@ V dentist::ms_knee(F f) } -V dentist::m_dsp(I n,S *const *in,S *const *out) +V dentist::m_dsp(I n,S *const *,S *const *) { - const I _D = Blocksize(); + const I _D = n; const F _R = Samplerate(); if(_D != blsz || _R != smprt) { blsz = _D; @@ -216,7 +216,7 @@ V dentist::m_signal(I n,S *const *in,S *const *out) { /* declare working variables */ I i, j; - const I _D = blsz,_N = _D*_MULT_,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; + const I _D = n,_N = _D*_MULT_,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; _inCount += _D; diff --git a/externals/grill/fftease/src/disarray~.cpp b/externals/grill/fftease/src/disarray~.cpp index 428fe2d6..7ddc4333 100644 --- a/externals/grill/fftease/src/disarray~.cpp +++ b/externals/grill/fftease/src/disarray~.cpp @@ -169,9 +169,9 @@ V disarray::ms_freq(F f) } -V disarray::m_dsp(I n,S *const *in,S *const *out) +V disarray::m_dsp(I n,S *const *,S *const *) { - const I _D = Blocksize(); + const I _D = n; const F _R = Samplerate(); if(_D != blsz || _R != smprt) { @@ -226,7 +226,7 @@ V disarray::m_signal(I n,S *const *in,S *const *out) { /* declare working variables */ I i, j; - const I _D = blsz,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; + const I _D = n,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; _inCount += _D; diff --git a/externals/grill/fftease/src/drown~.cpp b/externals/grill/fftease/src/drown~.cpp index 0e4ee4a8..7db3f4f0 100644 --- a/externals/grill/fftease/src/drown~.cpp +++ b/externals/grill/fftease/src/drown~.cpp @@ -113,9 +113,9 @@ V drown::Delete() } -V drown::m_dsp(I n,S *const *in,S *const *out) +V drown::m_dsp(I n,S *const *,S *const *) { - const I _D = Blocksize(); + const I _D = n; const F _R = Samplerate(); if(_D != blsz || _R != smprt) { @@ -184,7 +184,7 @@ V drown::m_signal(I n,S *const *in,S *const *out) { /* declare working variables */ I i, j; - const I _D = blsz,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; + const I _D = n,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; _inCount += _D; diff --git a/externals/grill/fftease/src/ether~.cpp b/externals/grill/fftease/src/ether~.cpp index 16fbaaff..12a0d359 100644 --- a/externals/grill/fftease/src/ether~.cpp +++ b/externals/grill/fftease/src/ether~.cpp @@ -61,7 +61,7 @@ FLEXT_LIB_DSP_V("fftease, ether~",ether) V ether::setup(t_classid c) { FLEXT_CADDATTR_VAR1(c,"invert",_invert); - FLEXT_CADDATTR_VAR1(c,"thresh",_threshMult); + FLEXT_CADDATTR_VAR1(c,"index",_threshMult); } @@ -131,9 +131,9 @@ V ether::Delete() } -V ether::m_dsp(I n,S *const *in,S *const *out) +V ether::m_dsp(I n,S *const *,S *const *) { - const I _D = Blocksize(); + const I _D = n; const F _R = Samplerate(); if(_D != blsz || _R != smprt) { @@ -177,7 +177,7 @@ V ether::m_signal(I n,S *const *in,S *const *out) { /* declare working variables */ I i, j; - const I _D = blsz,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; + const I _D = n,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; _inCount += _D; diff --git a/externals/grill/fftease/src/fft.c b/externals/grill/fftease/src/fft.c index f920e231..11c5da6d 100644 --- a/externals/grill/fftease/src/fft.c +++ b/externals/grill/fftease/src/fft.c @@ -1,7 +1,7 @@ #include "pv.h" -//float TWOPI; +/* float TWOPI; */ /* If forward is true, rfft replaces 2*N real data points in x with N complex values representing the positive frequency half of their diff --git a/externals/grill/fftease/src/pv.h b/externals/grill/fftease/src/pv.h index b945e72e..32f94543 100644 --- a/externals/grill/fftease/src/pv.h +++ b/externals/grill/fftease/src/pv.h @@ -8,10 +8,11 @@ #include -// ------------------------------------- -// modifications by Thomas Grill +/* ------------------------------------- + modifications by Thomas Grill +*/ -//#include +/* #include */ #include #ifdef _MSC_VER @@ -24,7 +25,7 @@ extern "C" { #endif -// ------------------------------------- +/* ------------------------------------- */ #define FORWARD 1 @@ -50,11 +51,11 @@ void convert(float *S, float *C, int N2, float *lastphase, float fundamental, f void unconvert(float *C, float *S, int N2, float *lastphase, float fundamental, float factor ); -// ------------------------------------- +/* ------------------------------------- */ #ifdef __cplusplus } #endif -// ------------------------------------- +/* ------------------------------------- */ -- cgit v1.2.1