comparison dsp/transforms/FFT.cpp @ 55:7fe29d8a7eaf

* Various fixes related to the bar estimator code

     Centre for Digital Music, Queen Mary, University of London.
     This file is based on Don Cross's public domain FFT implementation.
 */
 
 #include "FFT.h"
+
+#include "maths/MathUtilities.h"
+
 #include <cmath>
+
+#include <iostream>
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 

     unsigned int BlockSize, BlockEnd;
 
     double angle_numerator = 2.0 * M_PI;
     double tr, ti;
 
-    if( !isPowerOfTwo(p_nSamples) )
+    if( !MathUtilities::isPowerOfTwo(p_nSamples) )
     {
+        std::cerr << "ERROR: FFT::process: Non-power-of-two FFT size "
+                  << p_nSamples << " not supported in this implementation"
+                  << std::endl;
 	return;
     }
 
     if( p_bInverseTransform ) angle_numerator = -angle_numerator;
 

 	    p_lpImagOut[i] /= denom;
 	}
     }
 }
 
-bool FFT::isPowerOfTwo(unsigned int p_nX)
-{
-    if( p_nX < 2 ) return false;
-
-    if( p_nX & (p_nX-1) ) return false;
-
-    return true;
-}
-
 unsigned int FFT::numberOfBitsNeeded(unsigned int p_nSamples)
 {	
     int i;
 
     if( p_nSamples < 2 )