comparison jnmr/testApp.cpp @ 40:776694bcbd02

removed text and fixed key commands for tempo

 	
 	screenWidth = ofGetWidth();
 	screenHeight = ofGetHeight();
 	midiEvents.screenWidth = &screenWidth;
 	midiEvents.screenHeight = &screenHeight;
-	midiEvents.drawTempoMode = true;
+	//midiEvents.drawTempoMode = true;
 	ofSetFrameRate(30);
 	
 	midiEvents.ticksPerScreen += 4000;
 	lastScoreIndexSent = 0;
 	performanceRating = 0.0;

 	m.addStringArg( noteString);
 	sender.sendMessage( m ); 
 }
 
 void testApp::sendNoteToMuseScore(){
-	if (midiEvents.recordedNoteOnMatrix.size() > 0){
-	int ticks = midiEvents.recordedNoteOnMatrix[midiEvents.bestMatchIndex][0];
-	int pitch = midiEvents.recordedNoteOnMatrix[midiEvents.bestMatchIndex][1];
-//	printf("sending to muse score %i, %i \n", ticks, pitch);
-	sendNoteDataByOsc(pitch, ticks);
+	int noteToSendIndex = lastScoreIndexSent;
+	while (noteToSendIndex < midiEvents.bestMatchIndex){
+		noteToSendIndex++;
+		if (midiEvents.recordedNoteOnMatrix.size() > 0 && noteToSendIndex < midiEvents.recordedNoteOnMatrix.size()){
+			int ticks = midiEvents.recordedNoteOnMatrix[noteToSendIndex][0];//midiEvents.bestMatchIndex
+			int pitch = midiEvents.recordedNoteOnMatrix[noteToSendIndex][1];
+			//	printf("sending to muse score %i, %i \n", ticks, pitch);
+			sendNoteDataByOsc(pitch, ticks);
+		}
 	}
 	/*
 		ofxOscMessage m;
 		m.setAddress( "/plugin" );
 		string noteString;	

 	ofSetHexColor(0xFF0000);
 //	ofDrawBitmapString(info, 20, 20);
 	
 	midiEvents.drawMidiFile(noteInStream.midiInputEvents);
 
-	drawMuseScoreText();
+	//drawMuseScoreText();
 	
 	ofSetHexColor(0x000000);
 	ofDrawBitmapString(midiPortName, 20, ofGetHeight() - 20);
 	
 }

 	if (key == 'p'){
 		midiEvents.printNotes();
 	}
 
 	if (key == 'l')
-		
-		
-		//midiEvents.bayesStruct.decaySpeedDistribution(100);
-	
-	if (key == 't')
+		midiEvents.bayesStruct.decaySpeedDistribution(100);
+	
+	if (key == 'f'){
+		//flip
 		midiEvents.drawTempoMode = !midiEvents.drawTempoMode;
+		midiEvents.drawPhaseMode = !midiEvents.drawPhaseMode;
+	}
+	
+	
+	if (key == 't'){
+		midiEvents.drawTempoMode = !midiEvents.drawTempoMode;
+	}
 	
 	if (key == 'y')
 		midiEvents.drawPhaseMode = !midiEvents.drawPhaseMode;
 	
 	if (key == 'r'){