aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/fftease/src/vacancy~.cpp
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2003-01-18 04:35:33 +0000
committerThomas Grill <xovo@users.sourceforge.net>2003-01-18 04:35:33 +0000
commit9ff5ccdea43ff2a954c1a400516dc6858e188e9c (patch)
tree6098867a573275a38bf000a382752bf115af0765 /externals/grill/fftease/src/vacancy~.cpp
parent478eeca99ee6f5bad3063700fbcc9d8913c770ae (diff)
""
svn path=/trunk/; revision=344
Diffstat (limited to 'externals/grill/fftease/src/vacancy~.cpp')
-rw-r--r--externals/grill/fftease/src/vacancy~.cpp11
1 files changed, 6 insertions, 5 deletions
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];