diff src/testApp.h @ 8:166bece5922c

Version that works sequentially with chroma and onset energy, but doesn't use combined matrix, hence more efficient. playing switches okay, bug fixed on path calculation

--- a/src/testApp.h	Fri Nov 04 23:23:13 2011 +0000
+++ b/src/testApp.h	Mon Nov 07 17:24:52 2011 +0000
@@ -49,7 +49,9 @@
 
 		void loadFirstAudioFile();
 		void initialiseVariables();
-
+	
+		void clearVectors();
+	
 		void calculateSimilarityAndAlignment();
 	
 	typedef std::vector<double> DoubleVector;
@@ -57,9 +59,7 @@
 	
 	typedef std::vector<int> IntVector;
 	typedef std::vector<IntVector> IntMatrix;
-	
-//	DoubleMatrix chromaMatrix;
-//	DoubleMatrix secondMatrix;
+
 	DoubleMatrix* matrixPtr;
 	
 	void drawDoubleMatrix(DoubleMatrix* dMatrix);//DoubleMatrix* dMatrix); WOULD BE NICE TO USE POINTER BUT NOT WORKING YET
@@ -108,7 +108,7 @@
 	void calculateAlignmentMatrix();
 //	void performNextAlignment();
 	double getDistance(int i, int j);
-	void printAlignmentMatrix();
+	void printAlignmentMatrix(const DoubleMatrix& alignmentMatrix);
 	double getMinimum(int i, int j, float newValue);
 	bool extendAlignmentUp();
 	bool extendAlignmentAlong();
@@ -202,7 +202,7 @@
 		Chromagram chromaG;
 	OnsetDetectionFunction* onset;
 	
-	int conversionFactor;
+	float conversionFactor;
 };
 
 #endif