From 9ff5ccdea43ff2a954c1a400516dc6858e188e9c Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 18 Jan 2003 04:35:33 +0000 Subject: "" svn path=/trunk/; revision=344 --- externals/grill/fftease/src/vacancy~.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'externals/grill/fftease/src/vacancy~.cpp') diff --git a/externals/grill/fftease/src/vacancy~.cpp b/externals/grill/fftease/src/vacancy~.cpp index a6d0a852..4377290d 100644 --- a/externals/grill/fftease/src/vacancy~.cpp +++ b/externals/grill/fftease/src/vacancy~.cpp @@ -23,7 +23,7 @@ public: protected: virtual V Transform(I n,S *const *in); - V ms_thresh(F thr) { _threshold = (F)pow(10.,(_threshdB = thr)*.05); } + V ms_thresh(F thr) { _threshold = FromdB(_threshdB = thr); } F _threshold,_threshdB; BL _invert,_useRms,_swapPhase; @@ -94,30 +94,31 @@ vacancy::vacancy(I argc,const t_atom *argv): V vacancy::Transform(I _N2,S *const *in) { const F useme = _useRms?_rms * _threshold:_threshold; + const I _N = _N2; // composite here please if (_invert) if (_swapPhase) - for (I i=0; i < _N2; i+=2 ) + for (I i=0; i < _N; i+=2 ) if ( _channel1[i] > useme && _channel2[i] < _channel1[i] ) { _channel1[i] = _channel2[i]; _channel1[i+1] = _channel2[i+1]; } else - for (I i=0; i < _N2; i+=2 ) + for (I i=0; i < _N; i+=2 ) if ( _channel1[i] > useme && _channel2[i] < _channel1[i] ) { _channel1[i] = _channel2[i]; if ( _channel1[i+1] == 0. ) _channel1[i+1] = _channel2[i+1]; } else if (_swapPhase) - for (I i=0; i < _N2; i+=2 ) + for (I i=0; i < _N; i+=2 ) if ( _channel1[i] < useme && _channel2[i] > _channel1[i] ) { _channel1[i] = _channel2[i]; _channel1[i+1] = _channel2[i+1]; } else - for (I i=0; i < _N2; i+=2 ) + for (I i=0; i < _N; i+=2 ) if ( _channel1[i] < useme && _channel2[i] > _channel1[i] ) { _channel1[i] = _channel2[i]; if ( _channel1[i+1] == 0. ) _channel1[i+1] = _channel2[i+1]; -- cgit v1.2.1