""

svn path=/trunk/; revision=339

1 files changed, 8 insertions, 152 deletions

diff --git a/externals/grill/fftease/src/ether~.cpp b/externals/grill/fftease/src/ether~.cpp
index 12a0d359..e04efaec 100644
--- a/externals/grill/fftease/src/ether~.cpp
+++ b/externals/grill/fftease/src/ether~.cpp
@@ -13,41 +13,21 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #include <stdlib.h>
 
 class ether:
-	public flext_dsp
+	public fftease
 {
-	FLEXT_HEADER_S(ether,flext_dsp,setup)
+	FLEXT_HEADER_S(ether,fftease,setup)
 	
 public:
 	ether(I argc,const t_atom *argv);
-	~ether();
 
 protected:
 
-	virtual V m_dsp(I n,S *const *in,S *const *out);
-	virtual V m_signal(I n,S *const *in,S *const *out);
-
-	I blsz;
-	F smprt;
-
-    F *_input1,*_input2;
-    F *_buffer1,*_buffer2;
-    F *_channel1,*_channel2;
-    F *_output;
-    F *_trigland;
-    I *_bitshuffle;
-    F *_Wanal,*_Wsyn,*_Hwin;
-
-    I _inCount,_nmult;
-
-	// -----------------------------
+	virtual V Transform(I n,S *const *in);
 
 	BL _qual,_invert;
 	F _threshMult;
 
 private:
-	V Clear();
-	V Delete();
-
 	static V setup(t_classid c);
 
 
@@ -66,7 +46,7 @@ V ether::setup(t_classid c)
 
 
 ether::ether(I argc,const t_atom *argv):
-	blsz(0),smprt(0),
+	fftease(2,true,true,true),
 	_qual(false),_threshMult(0),_invert(false)
 {
 	/* parse and set object's options given */
@@ -77,131 +57,21 @@ ether::ether(I argc,const t_atom *argv):
 			post("%s - Quality must be a boolean value - set to %0i",thisName(),_qual?1:0);
 	}
 
-	_nmult = _qual?4:2;
-
-	Clear();
+	_mult = _qual?4:2;
+	_window = _qual;
 
 	AddInSignal("Messages and input signal");
 	AddInSignal("Reference signal");
 	AddOutSignal("Transformed signal");
 }
 
-ether::~ether()
-{
-	Delete();
-}
-
-V ether::Clear()
-{
-	_input1 = _input2 = NULL;
-	_buffer1 = _buffer2 = NULL;
-	_channel1 = _channel2 = NULL;
-	_output = NULL;
-
-	_bitshuffle = NULL;
-	_trigland = NULL;
-
-	_Hwin = NULL;
-	_Wanal = _Wsyn = NULL;
-
-	// -----------------------------
-}
-
-V ether::Delete() 
-{
-	if(_input1) delete[] _input1;
-	if(_buffer1) delete[] _buffer1;
-	if(_channel1) delete[] _channel1;
-
-	if(_input2) delete[] _input2;
-	if(_buffer2) delete[] _buffer2;
-	if(_channel2) delete[] _channel2;
-
-	if(_output) delete[] _output;
-
-	if(_bitshuffle) delete[] _bitshuffle;
-	if(_trigland) delete[] _trigland;
-
-	if(_Wanal) delete[] _Wanal;
-	if(_Wsyn) delete[] _Wsyn;
-	if(_Hwin) delete[] _Hwin;
-
-	// -----------------------------
-
-}
-
-
-V ether::m_dsp(I n,S *const *,S *const *)
-{
-	const I _D = n;
-	const F _R = Samplerate();
-
-	if(_D != blsz || _R != smprt) {
-		blsz = _D;
-		smprt = _R;
-
-		Delete();
-		// ---------------------------------------------
-
-		const int _N = _D*_nmult,_Nw = _N,_Nw2 = _Nw>>1,_N2 = _N>>1;
-
-		_inCount = -_Nw;
-
-		_input1 = new F[_Nw];	
-		_buffer1 = new F[_N];
-		_channel1 = new F[_N+2];
-
-		_input2 = new F[_Nw];	
-		_buffer2 = new F[_N];
-		_channel2 = new F[_N+2];
-
-		_output = new F[_Nw];
-
-		_bitshuffle = new I[_N*2];
-		_trigland = new F[_N*2];
-
-		_Wanal = new F[_Nw];	
-		_Wsyn = new F[_Nw];	
-		_Hwin = new F[_Nw];
-
-		init_rdft( _N, _bitshuffle, _trigland);
-
-		if(_qual) 
-			makewindows( _Hwin, _Wanal, _Wsyn, _Nw, _N, _D, 0);
-		else
-			makehanning( _Hwin, _Wanal, _Wsyn, _Nw, _N, _D, 0,0);
-	}
-}
 
-V ether::m_signal(I n,S *const *in,S *const *out)
+V ether::Transform(I _N2,S *const *in)
 {
-	/* declare working variables */
-	I i, j; 
-	const I _D = n,_N = _D*_nmult,_Nw = _N,_N2 = _N/2,_Nw2 = _Nw/2; 
-
-	_inCount += _D;
-
-	for ( j = 0 ; j < _N-_D ; j++ ) {
-		_input1[j] = _input1[j+_D];
-		_input2[j] = _input2[j+_D];
-	}
-	for (i = 0; j < _N; j++,i++ ) {
-		_input1[j] = in[0][i];
-		_input2[j] = in[1][i];
-	}
-
-	fold( _input1, _Wanal, _Nw, _buffer1, _N, _inCount );		
-	fold( _input2, _Wanal, _Nw, _buffer2, _N, _inCount );	
-
-	rdft( _N, 1, _buffer1, _bitshuffle, _trigland );
-	rdft( _N, 1, _buffer2, _bitshuffle, _trigland );
-
-	// ---- BEGIN --------------------------------
-
 	F threshMult = _threshMult;
 	if (threshMult == 0. )  threshMult = 1;
 
-	for ( i = 0; i <= _N2; i++ ) {
+	for (I i = 0; i <= _N2; i++ ) {
 		int even = i<<1,odd = even + 1;
 
 		/* convert to polar coordinates from complex values */
@@ -233,19 +103,5 @@ V ether::m_signal(I n,S *const *in,S *const *out)
 		if (i != _N2 )
 			_buffer1[odd] = -_channel1[even] * sin( _channel1[odd] );
 	}
-
-	// ---- END --------------------------------
-
-	rdft( _N, -1, _buffer1, _bitshuffle, _trigland );
-	overlapadd( _buffer1, _N, _Wsyn, _output, _Nw, _inCount);
-
-	const F mult = 1./_N;
-	for ( j = 0; j < _D; j++ )
-		out[0][j] = _output[j] * mult;
-
-	for ( j = 0; j < _N-_D; j++ )
-		_output[j] = _output[j+_D];	
-	for (; j < _N; j++ )
-		_output[j] = 0.;
 }