comparison src/CannamMidiFileLoader.cpp @ 3:de86d77f2612

added speed prior setting. needs some cleaning

  */
 
 #include "MIDIFileReader.h"
 #include "CannamMidiFileLoader.h"
 
+CannamMidiFileLoader::CannamMidiFileLoader(){
+	chopBeginning = true;
+}
+
 int CannamMidiFileLoader::loadFile(std::string& filename, midiEventHolder& myMidiEvents){
 		
-		
+		noteOnIndex = 0;
 		myMidiEvents.clearAllEvents();
 		
 		//int main(int argc, char **argv)
 		//{
 		//	if (argc != 2) {

 						cout << t << ": Note: channel " << ch
 						<< " duration " << j->getDuration()
 						<< " pitch " << j->getPitch()
 						<< " velocity " << j->getVelocity() 
 						<< "event time " << myMidiEvents.getEventTimeMillis(t) << endl;
+
+						
+						if (noteOnIndex == 0){
+							firstNoteTime = myMidiEvents.getEventTimeMillis(t);
+							firstTickTime = t;
+						}
+						
+						noteOnIndex++;
+						
 						v.clear();
-						v.push_back(t);
+						
+						if (!chopBeginning)
+							v.push_back(t);
+						else
+							v.push_back(t - firstTickTime);
+						
 						v.push_back(j->getPitch());
 						v.push_back(j->getVelocity());
 						v.push_back(j->getDuration());
 						myMidiEvents.recordedNoteOnMatrix.push_back(v);
+						
+						if (!chopBeginning)
 						myMidiEvents.recordedEventTimes.push_back(myMidiEvents.getEventTimeMillis(t));
+						else {
+						myMidiEvents.recordedEventTimes.push_back(myMidiEvents.getEventTimeMillis(t) - firstNoteTime);
+							printf("chopping beginning %f \n", myMidiEvents.getEventTimeMillis(t) - firstNoteTime);
+						}
+
 						break;
 						
 					case MIDI_POLY_AFTERTOUCH:
 						cout << t << ": Polyphonic aftertouch: channel " << ch
 						<< " pitch " << j->getPitch()