Index: FFT_ooura.cxx
===================================================================
--- FFT_ooura.cxx	(revision 10015)
+++ FFT_ooura.cxx	(working copy)
@@ -90,92 +90,47 @@
 	mOutput.Produce();
 	return toReturn;
   }
-
-  bool FFT_ooura::Do(const Audio& in, Spectrum &out){
-	TData *inbuffer;
-
-	CLAM_DEBUG_ASSERT(GetExecState() == Running,
-					  "FFT_ooura: Do(): Not in execution mode");
-	CLAM_DEBUG_ASSERT(isPowerOfTwo(mSize),
-					  "FFT_ooura: Do(): Not a power of two");
-
+  
+  
+   bool FFT_ooura::Do(const Audio& in, Spectrum &out){
+	//will use a non in-place version avoiding copying the input buffer
+	fftbuffer = in.GetBuffer().GetPtr();
 	out.SetSpectralRange(in.GetSampleRate()/2);
+	rdft(mSize, 1, fftbuffer, ip, w);
+	ToMagPhase(out);
 
-	switch(mState) {
-	case sComplex:
-	  inbuffer = in.GetBuffer().GetPtr();
-	  // Buffer dump. This is a kludge; the right way to do this
-	  // is using a non-inplace version of rdft (which would
-	  // not reduce performance).
-	  for (int i=0; i<mSize; i++)
-		fftbuffer[i] = inbuffer[i];
-	  rdft(mSize, 1, fftbuffer, ip, w);
-	  ToComplex(out);
-	  break;
-	case sComplexSync:
-	  inbuffer = in.GetBuffer().GetPtr();
-	  // Buffer dump. This is a kludge; the right way to do this
-	  // is using a non-inplace version of rdft (which would
-	  // not reduce performance).
-	  for (int i=0; i<mSize; i++)
-		fftbuffer[i]=inbuffer[i];
-	  rdft(mSize, 1, fftbuffer, ip, w);
-	  ToComplex(out);
-	  out.SynchronizeTo(mComplexflags);
-	  break;
-	case sOther:
-	  CheckTypes(in,out);
-	  inbuffer = in.GetBuffer().GetPtr();
-	  // Buffer dump. This is a kludge; the right way to do this
-	  // is using a non-inplace version of rdft (which would
-	  // not reduce performance).
-	  for (int i=0; i<mSize; i++)
-		fftbuffer[i]=inbuffer[i];
-	  rdft(mSize, 1, fftbuffer, ip, w);
-	  
-	  ToOther(out);
-	  break;
-	default:
-	  CLAM_ASSERT(false, "FFT_ooura: Do(): Inconsistent state");
-	}
-
 	return true;
   }
 
-
-  void FFT_ooura::ToComplex(Spectrum &out) {
-	Array<Complex>& outbuffer = out.GetComplexArray();
-
-	outbuffer[0].SetReal(fftbuffer[0]);   // Real Values
-	outbuffer[0].SetImag(0);   // Real Values
-	outbuffer[mSize/2].SetReal(fftbuffer[1]);
-	outbuffer[mSize/2].SetImag(0);
-		
-	for (int i=1; i<mSize/2; i++) {
-	  outbuffer[i].SetReal(fftbuffer[2*i]);  
-	  outbuffer[i].SetImag(-fftbuffer[2*i+1]);
+  
+  void FFT_ooura::ToMagPhase(Spectrum &out) {
+	int i,r,im;
+	DataArray& magBuffer = out.GetMagBuffer();
+	DataArray& phaseBuffer = out.GetPhaseBuffer();
+	
+	TData real, imag;
+	
+	real = fftbuffer[0];   // Real Values
+	
+	magBuffer[0] = CLAM_sqrt(real*real);
+	phaseBuffer[0] = 0;
+	
+	real = fftbuffer[1];
+	
+	magBuffer[mSize/2] = CLAM_sqrt(real*real);
+	phaseBuffer[mSize/2] = 0;
+				
+	for (i=1, r=2, im=3; i<mSize/2; i++, r+=2, im+=2) {
+	  real = fftbuffer[r];  
+	  imag = -fftbuffer[im];
+	  magBuffer[i] = CLAM_sqrt(real*real+imag*imag);
+	  phaseBuffer[i] = CLAM_atan2(imag,real);
 	}
 		
-	outbuffer.SetSize(mSize/2+1);
+	magBuffer.SetSize(mSize/2+1);
+	phaseBuffer.SetSize(mSize/2+1);
   }
 
-	void FFT_ooura::ToOther(Spectrum &out)
-	{
-		if(out.HasComplexArray()) {
-			ToComplex(out);
-			out.SynchronizeTo(mComplexflags);
-		}
-		else {
-			SpecTypeFlags flags;
-			out.GetType(flags);
-			
-			
-			ToComplex(mComplexSpectrum);
-			out.SynchronizeTo(mComplexSpectrum);
-		}
-	}
-
-
   ////////////////////////////////////
   // Original Ooura FFT functions, modified to accept TData instead of double
 
@@ -749,4 +704,3 @@
 
 
 }; // CLAM
-