comparison src/testApp.h @ 5:0d51e93bfe74

some work in improving the efficiency of doing chroma and onset analysis ahs been made - don't need to recalculate the chroma comparison each time

 
 		void audioRequested 	(float * input, int bufferSize, int nChannels);
 		void loadSndfile();
 		//double getEnergyOfFrame();
 
-	
+	void drawAlignmentmeasureValues(const int& startingYframe);
 		void drawChromoGram();
 
 		void loadFirstAudioFile();
 		void initialiseVariables();
 
 		void calculateSimilarityAndAlignment();
 	
 	typedef std::vector<double> DoubleVector;
 	typedef std::vector<DoubleVector> DoubleMatrix;
+	
+	typedef std::vector<int> IntVector;
+	typedef std::vector<IntVector> IntMatrix;
 	
 //	DoubleMatrix chromaMatrix;
 //	DoubleMatrix secondMatrix;
 	DoubleMatrix* matrixPtr;
 	

 	
 	bool drawSimilarity;
 	void drawSimilarityMatrix();
 	void printSimilarityMatrix(int sizeToPrint);
 	
+	
+	void drawChromaSimilarityMatrix();
+	
 //	DoubleMatrix alignmentMeasureMatrix;
 
 //	DoubleVector minimumAlignmentPath;
 	
-	void drawAlignmentPath(int startingChromaXFrame, int startingChromaYFrame);
+	void drawAlignmentPath(int startingChromaXFrame, int startingChromaYFrame, IntMatrix* backPath);
 	void drawForwardsAlignmentPath(int startingChromaXFrame, int startingChromaYFrame);
 	int findStartWidthFrame();	  
 	
 	void printScoreForRow(int row, int max);
 	
 	int numberOfScrollWidthsForFirstFile;
 	int numberOfScrollWidthsForSecondFile;
 	
 	void checkIfAudioPositionExceedsWidthForFirstFile();
-	
-	typedef std::vector<int> IntVector;
-	typedef std::vector<IntVector> IntMatrix;
+
 		
 //	IntMatrix backwardsAlignmentPath;
 	int backwardsAlignmentIndex;//used for drawing the path
 	
 	void updateAlignmentPathIndex(int idenifier);

 	int findMinimumOfVector(DoubleVector *d);
 	void swapBetweenPlayingFilesUsingAlignmentMatch();
 	int findMatchFromAlignment(bool whichFileToTest);
 	
 	void drawEnergyVectorFromPointer(DoubleVector* energyVec);
+	void drawForwardsAlignmentPathOnChromaSimilarity(const int& startingXFrame, const int& startingYFrame);
 	
 		void processAudioToDoubleMatrix(DoubleMatrix* myDoubleMatrix, DoubleVector* energyVector);
 	
 		void loadNewAudio(string soundFileName);
 		void loadSecondAudio(string soundFileName);

 		ChordDetect chord;
 			//sndfile part
 		SNDFILE *infile; // define input and output sound files
 		SF_INFO sfinfo ; // struct to hold info about sound file
 	
-		int chromaConversionRatio;//not needed but could be useful
+		float chromaConversionRatio;//not needed but could be useful
 		TimeWarp tw;
 		Chromagram chromaG;
 	OnsetDetectionFunction* onset;
 	
 	int conversionFactor;