comparison Spectrogram.cpp @ 10:17a260410116

Change NULL to 0 throughout

     m_inputLength(inputLength),
     m_windowLength(windowLength),
     m_fftLength(fftLength),
     m_hopSize(hopSize),
     m_numberOfOutputBins(ceil(fftLength/2) + 1),
-    fftInput(NULL),
-    fftOutputReal(NULL),
-    fftOutputImag(NULL)
+    fftInput(0),
+    fftOutputReal(0),
+    fftOutputImag(0)
 {
     initialise();
 }
 
 Spectrogram::~Spectrogram(){

 void Spectrogram::cleanup(){
     delete []fftInput;
     delete []fftOutputReal;
     delete []fftOutputImag;
     
-    fftInput = fftOutputReal = fftOutputImag = NULL;
+    fftInput = fftOutputReal = fftOutputImag = 0;
 }
 
 //process method
 vector< vector<float> > Spectrogram::audioToMagnitudeSpectrogram(const float * const input, const float * window){
     

         }
         for (int n = m_windowLength; n < m_fftLength; n++){
             fftInput[n] = 0.0;
         }
         
-        FFT::forward(m_fftLength, fftInput, NULL, fftOutputReal, fftOutputImag);
+        FFT::forward(m_fftLength, fftInput, 0, fftOutputReal, fftOutputImag);
         
         //@todo: sample at logarithmic spacing? Leave for host?
         for(int k = 0; k < m_numberOfOutputBins; k++){
             spectrogramOutput[k][writeBlockPointer] = (fftOutputReal[k]*fftOutputReal[k] + fftOutputImag[k]*fftOutputImag[k]); //Magnitude or power?
         }