diff Spectrogram.cpp @ 12:d58409ecd720

* Merging Chris' changes

--- a/Spectrogram.cpp	Wed Aug 13 10:45:46 2014 +0100
+++ b/Spectrogram.cpp	Wed Aug 13 10:47:39 2014 +0100
@@ -16,9 +16,9 @@
     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();
 }
@@ -41,7 +41,7 @@
     delete []fftOutputReal;
     delete []fftOutputImag;
     
-    fftInput = fftOutputReal = fftOutputImag = NULL;
+    fftInput = fftOutputReal = fftOutputImag = 0;
 }
 
 //process method
@@ -66,7 +66,7 @@
             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++){
@@ -78,4 +78,4 @@
     }
     
     return spectrogramOutput;
-}
\ No newline at end of file
+}