comparison src/midiEventHolder.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

 
 
 
 void midiEventHolder::printRecordedEvents(){
 	printf("Recorded Events:\n");
-	for (int i = 0;i < recordedNoteOnMatrix.size() && i < recordedEventTimes.size();i++){
+	for (int i = 0;i < recordedNoteOnMatrix.size();i++){
 		for (int k = 0;k < recordedNoteOnMatrix[i].size();k++){
 			printf("[%i] = %i ,", i, recordedNoteOnMatrix[i][k]);
 		}
-		printf("time %f \n", recordedEventTimes[i]);
+		if (i < recordedEventTimes.size())
+			printf("time %f \n", recordedEventTimes[i]);
+		else
+			printf("\n");
 	}
 	
 }
 
 

 			noteOnMatrix[i].swap(noteOnMatrix[nextIndex]);
 			currentTime = noteOnMatrix[i][0];
 		}
 		
 	}	
-	
-
-}
+		
+	printRecordedEvents();
+
+}
+
+
+
+
+void midiEventHolder::doublecheckOrder(IntMatrix& noteOnMatrix){
+
+	for (int i = 0;i < noteOnMatrix.size();i++){
+		int nextIndex = getIndexOfMinimumAboveIndex(i, noteOnMatrix);
+		if (nextIndex > i){
+			noteOnMatrix[i].swap(noteOnMatrix[nextIndex]);
+		}
+	}	
+}
+
+int midiEventHolder::getIndexOfMinimumAboveIndex(const int& index, IntMatrix& noteOnMatrix){
+	int returnIndex = index;
+	int min = noteOnMatrix[index][0];
+	for (int i = index;i < noteOnMatrix.size();i++){
+		if (noteOnMatrix[i][0] < min){
+			returnIndex = i;
+			min = noteOnMatrix[i][0];
+		}
+	}
+	return returnIndex;
+}
+
 
 int midiEventHolder::getIndexOfMinimumAboveTime(const double& time, IntMatrix& noteOnMatrix){
 	int index = 0;
 	double minimumTime = 100000000.;
 	int bestIndex = -1;