diff src/testApp.h @ 1:6842ff391568

getting rid of pointer use in processAudio - not many changes
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Wed, 18 May 2011 16:47:12 +0100
parents 572c856e38ac
children 9ce18f24b266
line wrap: on
line diff
--- a/src/testApp.h	Tue May 17 08:48:58 2011 +0100
+++ b/src/testApp.h	Wed May 18 16:47:12 2011 +0100
@@ -17,6 +17,9 @@
 #define ENERGY_LENGTH 80000
 #define CHROMA_LENGTH 12000
 #define CHROMA_CONVERSION_FACTOR 16 //16 times as many frames in energy as in chroma
+#define CHROMAGRAM_FRAMESIZE 2048
+
+
 //length in terms of frames (at 512 samples per frame - there are 90 per second) => 900: 10 seconds
 
 class testApp : public ofBaseApp{
@@ -109,7 +112,7 @@
 	
 	void drawEnergyVectorFromPointer(DoubleVector* energyVec);
 	
-		void processAudioToDoubleMatrix(Chromagram* chromaG, DoubleMatrix* myDoubleMatrix, DoubleVector* energyVector);
+		void processAudioToDoubleMatrix(DoubleMatrix* myDoubleMatrix, DoubleVector* energyVector);
 	
 		void loadNewAudio(string soundFileName);
 		void loadSecondAudio(string soundFileName);
@@ -188,7 +191,7 @@
 	
 	
 		timeWarp tw;
-
+		Chromagram chromaG;
 		
 };