diff Tempogram.h @ 13:7680cc4c0073

* Tidying - made length of array variables type size_t and for loops unsigned int, where index > 0. * Window length parameter is now a dropdown box.
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Wed, 13 Aug 2014 14:18:00 +0100
parents 09fb76606b2b
children
line wrap: on
line diff
--- a/Tempogram.h	Wed Aug 13 10:47:39 2014 +0100
+++ b/Tempogram.h	Wed Aug 13 14:18:00 2014 +0100
@@ -75,28 +75,27 @@
     // plugin-specific data and methods go here
     size_t m_blockSize;
     size_t m_stepSize;
-    float compressionConstant;
-    float *previousY;
-    float *currentY;
-    vector< vector<float> > specData; //spectrogram data
-    vector<float> noveltyCurve; //novelty curve data
-    float minDB;
+    float m_compressionConstant;
+    vector< vector<float> > m_spectrogram; //spectrogram data
+    vector<float> m_noveltyCurve; //novelty curve data
+    float m_minDB;
     
     void cleanup(); //used to release anything allocated in initialise()
     string floatToString(float value) const;
     void updateBPMParameters();
     
     //FFT params for noveltyCurve -> tempogra
-    unsigned int windowLength;
-    unsigned int fftLength;
-    unsigned int thopSize;
+    int m_log2WindowLength;
+    size_t m_windowLength;
+    size_t m_fftLength;
+    size_t m_hopSize;
     
-    float minBPM; // tempogram output bin range min
-    float maxBPM; // tempogram output bin range max
-    unsigned int minBin;
-    unsigned int maxBin;
+    float m_minBPM; // tempogram output bin range min
+    float m_maxBPM; // tempogram output bin range max
+    unsigned int m_minBin;
+    unsigned int m_maxBin;
     
-    int numberOfBlocks;
+    unsigned int m_numberOfBlocks;
     
     vector<Vamp::RealTime> ncTimestamps;
 };