comparison Tempogram.cpp @ 11:09fb76606b2b

* Removed many unnecessary heap allocations with objects

 
 void
 Tempogram::reset()
 {
     // Clear buffers, reset stored values, etc
-    cleanupForGRF();
     ncTimestamps.clear();
     specData.clear();
     specData = vector< vector<float> >(m_blockSize/2 + 1);
 }
 

     ncTimestamps.push_back(timestamp); //save timestamp
 
     return featureSet;
 }
 
-void
-Tempogram::initialiseForGRF(){
-    hannWindowtN = new float[windowLength];
-    
+Tempogram::FeatureSet
+Tempogram::getRemainingFeatures()
+{
+    
+    float * hannWindowtN = new float[windowLength];
     for (int i = 0; i < windowLength; i++){
         hannWindowtN[i] = 0.0;
     }
-}
-
-void
-Tempogram::cleanupForGRF(){
-    delete []hannWindowtN;
-    hannWindowtN = NULL;
-}
-
-
-
-Tempogram::FeatureSet
-Tempogram::getRemainingFeatures()
-{
-    //Make sure this is called at the beginning of the function
-    initialiseForGRF();
+    
     FeatureSet featureSet;
     
     //initialise noveltycurve processor
     NoveltyCurve nc(m_inputSampleRate, m_blockSize, numberOfBlocks, compressionConstant);
     noveltyCurve = nc.spectrogramToNoveltyCurve(specData); //calculate novelty curve from magnitude data

     
     //window function for spectrogram
     WindowFunction::hanning(hannWindowtN,windowLength);
     
     //initialise spectrogram processor
-    Spectrogram * spectrogramProcessor = new Spectrogram(numberOfBlocks, windowLength, fftLength, thopSize);
+    SpectrogramProcessor spectrogramProcessor(numberOfBlocks, windowLength, fftLength, thopSize);
     //compute spectrogram from novelty curve data (i.e., tempogram)
-    vector< vector<float> > tempogram = spectrogramProcessor->audioToMagnitudeSpectrogram(&noveltyCurve[0], hannWindowtN);
-    delete spectrogramProcessor;
-    spectrogramProcessor = NULL;
+    vector< vector<float> > tempogram = spectrogramProcessor.process(&noveltyCurve[0], hannWindowtN);
     
     int timePointer = thopSize-windowLength/2;
     int tempogramLength = tempogram[0].size();
     
     //push tempogram data to featureset 0 and set timestamps.

         featureSet[0].push_back(feature);
         
         timePointer += thopSize;
     }
     
-    //Make sure this is called at the end of the function
-    cleanupForGRF();
+    //float func = [](){ cout << "Hello"; };
+    
+    delete []hannWindowtN;
+    hannWindowtN = NULL;
     
     return featureSet;
 }