comparison src/testApp.cpp @ 2:5581023e0de4

Added separate CannamMidiFileLoader class to handle the loading in.

 	
 	screenWidth = ofGetWidth();
 	screenHeight = ofGetHeight();
 	midiEvents.screenWidth = &screenWidth;
 	midiEvents.screenHeight = &screenHeight;
-	ofSetFrameRate(100);
+	midiEvents.drawTempoMode = false;
+	ofSetFrameRate(30);
 }
 
 //--------------------------------------------------------------
 void testApp::update(){
 	if (playing){

 
 
 int testApp::cannamMainFunction(){
 
 
-		midiEvents.clearAllEvents();
+	midiEvents.clearAllEvents();
 	
 	//int main(int argc, char **argv)
 	//{
 	//	if (argc != 2) {
 	//		cerr << "Usage: midifile <file.mid>" << endl;
 	//		return 1;
 	//	}
 		
 	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;
 		}
 		

 			}
 			
 			
 		}
 		
-	//}
-	
-	
-	
-
-}//end cannam midi main
-
+}//end cannam midi main	
+	
+*/
+
+