comparison dsp/chromagram/Chromagram.cpp @ 64:6cb2b3cd5356

* Refactor FFT a little bit so as to separate construction and processing
  rather than have a single static method -- will make it easier to use a
  different implementation
* pull in KissFFT implementation (not hooked up yet)

     m_uK = ( unsigned int ) ceil( m_BPO * log(m_FMax/m_FMin)/log(2.0));	
 
     // Create array for chroma result
     m_chromadata = new double[ m_BPO ];
 
-    // Initialise FFT object	
-    m_FFT = new FFT;
-
     // Create Config Structure for ConstantQ operator
     CQConfig ConstantQConfig;
 
     // Populate CQ config structure with parameters
     // inherited from the Chroma config

     m_ConstantQ = new ConstantQ( ConstantQConfig );
 
     // Initialise working arrays
     m_frameSize = m_ConstantQ->getfftlength();
     m_hopSize = m_ConstantQ->gethop();
+
+    // Initialise FFT object	
+    m_FFT = new FFTReal(m_frameSize);
 
     m_FFTRe = new double[ m_frameSize ];
     m_FFTIm = new double[ m_frameSize ];
     m_CQRe  = new double[ m_uK ];
     m_CQIm  = new double[ m_uK ];

         m_windowbuf[i] = data[i];
     }
     m_window->cut(m_windowbuf);
 
     // FFT of current frame
-    m_FFT->process(m_frameSize, 0, m_windowbuf, NULL, m_FFTRe, m_FFTIm);
+    m_FFT->process(0, m_windowbuf, m_FFTRe, m_FFTIm);
 
     return process(m_FFTRe, m_FFTIm);
 }
 
 double* Chromagram::process( const double *real, const double *imag )