diff src/CannamMidiFileLoader.cpp @ 17:d75d16c57eac

Fixed the ordering of the note matrix when loaded so it has a double check feature that they are ordered min to max. Prevents draw problems down the line

--- a/src/CannamMidiFileLoader.cpp	Tue Nov 15 19:35:05 2011 +0000
+++ b/src/CannamMidiFileLoader.cpp	Tue Nov 15 20:06:55 2011 +0000
@@ -11,7 +11,7 @@
 #include "CannamMidiFileLoader.h"
 
 CannamMidiFileLoader::CannamMidiFileLoader(){
-	chopBeginning = false;
+	chopBeginning = true;
 }
 
 int CannamMidiFileLoader::loadFile(std::string& filename, midiEventHolder& myMidiEvents){
@@ -244,11 +244,20 @@
 			
 		}
 	
-		myMidiEvents.printRecordedEvents();
+	myMidiEvents.printRecordedEvents();
 	printf("|||||||||||||||||||||| \n\n\n\n\n\n\n");
 	myMidiEvents.reorderMatrixFromNoteTimes(myMidiEvents.recordedNoteOnMatrix);
 	myMidiEvents.correctTiming(myMidiEvents.recordedNoteOnMatrix);
+	myMidiEvents.doublecheckOrder(myMidiEvents.recordedNoteOnMatrix);
 
+	createEventTiming(myMidiEvents);
+	
+	myMidiEvents.printRecordedEvents();		
+	
+}//end cannam midi main
+	
+
+void CannamMidiFileLoader::createEventTiming( midiEventHolder& myMidiEvents){
 	
 	long t;
 	t = myMidiEvents.recordedNoteOnMatrix[0][0];
@@ -261,13 +270,11 @@
 			myMidiEvents.recordedEventTimes.push_back(myMidiEvents.getEventTimeMillis(t));
 		else {
 			myMidiEvents.recordedEventTimes.push_back(myMidiEvents.getEventTimeMillis(t) - firstNoteTime);
-		
+			
 		}
 	}
-	myMidiEvents.printRecordedEvents();		
 	
-}//end cannam midi main
-	
+}