diff Tempogram.h @ 7:21147df9cb2d

* Error when deleting Spectrogram object in Tempogram::getRemainingFeatures().
* Moved Spectrogram computation into own class.

--- a/Tempogram.h	Tue Aug 05 16:00:30 2014 +0100
+++ b/Tempogram.h	Thu Aug 07 16:21:21 2014 +0100
@@ -9,6 +9,14 @@
 #define _TEMPOGRAM_H_
 
 #include <vamp-sdk/Plugin.h>
+#include "FIRFilter.h"
+#include "WindowFunction.h"
+#include "NoveltyCurve.h"
+#include <vamp-sdk/FFT.h>
+#include <cmath>
+#include <fstream>
+#include <assert.h>
+#include "Spectrogram.h"
 
 using std::string;
 using std::vector;
@@ -43,6 +51,7 @@
     OutputList getOutputDescriptors() const;
 
     bool initialise(size_t channels, size_t stepSize, size_t blockSize);
+    void cleanup();
     void initialiseForGRF();
     void cleanupForGRF();
     void reset();
@@ -61,7 +70,6 @@
     float *previousY;
     float *currentY;
     vector< vector<float> > specData;
-    float ** spectrogram;
     vector<float> noveltyCurve;
     float minDB;