diff src/testApp.cpp @ 2:5581023e0de4

Added separate CannamMidiFileLoader class to handle the loading in.

--- a/src/testApp.cpp	Thu Aug 18 23:27:42 2011 +0100
+++ b/src/testApp.cpp	Fri Aug 19 01:26:40 2011 +0100
@@ -19,7 +19,8 @@
 	screenHeight = ofGetHeight();
 	midiEvents.screenWidth = &screenWidth;
 	midiEvents.screenHeight = &screenHeight;
-	ofSetFrameRate(100);
+	midiEvents.drawTempoMode = false;
+	ofSetFrameRate(30);
 }
 
 //--------------------------------------------------------------
@@ -206,7 +207,7 @@
 int testApp::cannamMainFunction(){
 
 
-		midiEvents.clearAllEvents();
+	midiEvents.clearAllEvents();
 	
 	//int main(int argc, char **argv)
 	//{
@@ -216,8 +217,18 @@
 	//	}
 		
 	std::string filename = midiFileName;//argv[1];
-		
-		MIDIFileReader fr(filename);
+	
+	fileLoader.loadFile(filename, midiEvents);
+	
+}//new end of load function
+
+
+
+
+	//trying to port to new class
+	/*
+			MIDIFileReader fr(filename);
+	
 		if (!fr.isOK()) {
 			std::cerr << "Error: " << fr.getError().c_str() << std::endl;
 			return 1;
@@ -418,10 +429,8 @@
 			
 		}
 		
-	//}
+}//end cannam midi main	
 	
-	
-	
+*/
 
-}//end cannam midi main