diff jnmr/testApp.cpp @ 41:60c1f0fbc8f4

Fixed annotation reader to read in beat and event times correctly

--- a/jnmr/testApp.cpp	Mon Dec 19 23:28:21 2011 +0000
+++ b/jnmr/testApp.cpp	Mon Jan 23 20:54:50 2012 +0000
@@ -21,6 +21,8 @@
 	this->args->printArgs();
 	this->args->printOpts();
 
+	createRWCfilenameStrings();
+	
 	loadRWCfileNumber(2);
 	openOutputFile(2);
 	loadAnnotation(2);
@@ -86,6 +88,7 @@
 	lastScoreIndexSent = 0;
 	midiEvents.bestMatchIndex = 0;
 	
+	
 }
 
 //--------------------------------------------------------------
@@ -214,6 +217,7 @@
 		
 		
 	}//end while osc
+	
 	if (midiEvents.recordedEventTimes.size() > 0)
 	checkNewScoreNote();
 	
@@ -620,32 +624,74 @@
 }
 
 void testApp::loadRWCfileNumber(const int& i){
-	if (i >= 1 && i <= 64){
-		midiFileNumber = i;
+	if (i >= 0 && i <= 64){
+		/*midiFileNumber = i;
 			if (i >= 10)
 				midiFileName = root + ofToString(midiFileNumber)+".MID";
 			else
 				midiFileName = root + "0"+ofToString(midiFileNumber)+".MID";
-		
-		printf("FILE:%s\n", midiFileName.c_str());
+		*/
+		midiFileName = root + rwcFileNameStrings[i]+".MID";
+		printf("MIDI FILE:%s\n", midiFileName.c_str());
 		cannamMainFunction();
 	}
 }
 
 std::string testApp::makeRWCfilename(std::string& root, const int& fileID, std::string& endPart){
 	std::string pathName;
-	if (fileID >= 1 && fileID <= 64){
-	
+	if (fileID >= 0 && fileID <= 64){
+
+		pathName = root + rwcFileNameStrings[fileID]+endPart;
+		/*
 		if (fileID >= 10)
 			pathName = root + ofToString(fileID)+endPart;
 		else
 			pathName = root + "0"+ofToString(fileID)+endPart;
-		
+		*/
 		printf("MAKE FILE:%s\n", midiFileName.c_str());
 	}
 		return pathName;
 }
 
+void testApp::createRWCfilenameStrings(){
+	rwcFileNameStrings.clear();
+	for (int i = 1;i< 10;i++){
+		rwcFileNameStrings.push_back("0"+ofToString(i));
+	}
+	for (int i = 10;i< 23;i++){
+		rwcFileNameStrings.push_back(ofToString(i));
+	}
+	rwcFileNameStrings.push_back("23A");
+	rwcFileNameStrings.push_back("23B");
+	rwcFileNameStrings.push_back("23C");
+	rwcFileNameStrings.push_back("23D");
+	rwcFileNameStrings.push_back("23E");
+
+	rwcFileNameStrings.push_back("24A");
+	rwcFileNameStrings.push_back("24B");
+	rwcFileNameStrings.push_back("24C");
+	
+	rwcFileNameStrings.push_back("25A");
+	rwcFileNameStrings.push_back("25B");
+	rwcFileNameStrings.push_back("25C");
+	rwcFileNameStrings.push_back("25D");
+
+	for (int i = 26;i< 35;i++){
+		rwcFileNameStrings.push_back(ofToString(i));
+	}
+	rwcFileNameStrings.push_back("35A");
+	rwcFileNameStrings.push_back("35B");
+	rwcFileNameStrings.push_back("35C");
+	for (int i = 36;i< 51;i++){
+		rwcFileNameStrings.push_back(ofToString(i));
+	}
+	
+//	for (int i = 0;i < rwcFileNameStrings.size();i++) {
+//		printf("RWC{%i}:'%s'\n", i, rwcFileNameStrings[i].c_str());
+//	}
+	
+}
+
 void testApp::loadAnnotation(const int& fileID){
 	string annotationRoot = "/Users/andrew/Documents/work/MuseScore/RWC/ANNOTATION/RM-C0";
 	string annotationEnding = "_annotation+WavPos.csv";