comparison jnmr/testApp.cpp @ 48:803edc47e825

Adding files, possibly some minor code changes

 
 testApp::testApp(ofxArgs* args){
 	this->args = args;
 }
 
+
 //--------------------------------------------------------------
 void testApp::setup(){
 
 	
 	

 	
 	myfile.open("../../../data/FilesOut/exampletest2.txt");
 	
 	
 	
-//	diffFile.open("../../../data/FilesOut/diffTest.txt");
+// 	diffFile.open("../../../data/FilesOut/diffTest.txt");
 	
 	midiEvents.fileOutput = &myfile;
 	midiEvents.differenceOutput = &diffFile;
 	
 	

 void testApp::update(){
 	if (playing){
 		midiEvents.updatePlayPosition();//this fn calls	midiEvents.bayesStruct.updateBestEstimate();
 	}
 //	drawer.tickLocation+=20;
+	checkOSCmessages();
+	
+	if (midiEvents.recordedEventTimes.size() > 0)
+	checkNewScoreNote();
+	
+}
+
+void testApp::checkOSCmessages(){
 	
 	// check for waiting messages
 	while( receiver.hasWaitingMessages() )
 	{
 		ofxOscMessage m;

 			if (velocity != 0){
 				if (readyToStart){
 					startPlaying();
 					printf("starting to PLAY!!!");
 				}
-			//	printf("MIDI NOTE %i \n", newMidiOnPitch);
+				//	printf("MIDI NOTE %i \n", newMidiOnPitch);
 				midiEvents.newNoteOnEvent(newMidiOnPitch, velocity, time);
 				noteInStream.newNoteCounted(newMidiOnPitch);//counts notes for an overall score
 			}
-
+			
 		}
 		
 		if ( m.getAddress() == "/setSpeedPrior" )
 		{
 			float speedPrior = m.getArgAsFloat(0);

 			//midiEvents.bayesStruct.speedPriorValue = speedPrior;
 		}
 		
 		if ( m.getAddress() == "/startplaying" )
 		{
-//			prepareToStartOnNextNote();
+			//			prepareToStartOnNextNote();
 			startPlaying();
 		}
 		
 		if ( m.getAddress() == "/stopplaying" )
 		{

 		
 		if ( m.getAddress() == "/integratedEstimate" )
 		{
 			midiEvents.bayesStruct.usingIntegratedTempoEstimate = true;
 		}
-	
+		
 		if ( m.getAddress() == "/MAPestimate" )
 		{
 			midiEvents.bayesStruct.usingIntegratedTempoEstimate = false;
 		}
 		

 			midiEvents.runningInRealTime = false;
 		}
 		
 		if ( m.getAddress() == "/minimumSpeedRatio" )
 		{
-				
+			
 			float minSpeed = m.getArgAsFloat(0);
 			//printf("minimum speed received is  %f and max is %f\n", minSpeed, midiEvents.bayesStruct.relativeSpeedLikelihood.getIndexInRealTerms(midiEvents.bayesStruct.relativeSpeedLikelihood.length-1));
 			if (minSpeed > 0 && minSpeed < midiEvents.bayesStruct.relativeSpeedLikelihood.getIndexInRealTerms(midiEvents.bayesStruct.relativeSpeedLikelihood.length-1)){
-			printf("minimum speed accepted is %f\n", minSpeed);
+				printf("minimum speed accepted is %f\n", minSpeed);
 				midiEvents.minimumMatchSpeed = minSpeed;
 			}
 		}
-
+		
 		if ( m.getAddress() == "/maximumSpeedRatio" )
 		{
 			
 			float maxSpeed = m.getArgAsFloat(0);
 			//printf("minimum speed received is  %f and max is %f\n", minSpeed, midiEvents.bayesStruct.relativeSpeedLikelihood.getIndexInRealTerms(midiEvents.bayesStruct.relativeSpeedLikelihood.length-1));

 			
 			if (ratio > 0.001 && ratio < 0.6){
 				midiEvents.likelihoodToNoiseRatio = ratio;
 				printf("likelihood for events relative to noise uses ratio %f\n", ratio);
 			}
-		
+			
 		}
 		
 		if ( m.getAddress() == "/duration" )
 		{
 			

 			loadAnnotation(m.getArgAsInt32(0));
 		}
 		
 		
 	}//end while osc
-	
-	if (midiEvents.recordedEventTimes.size() > 0)
-	checkNewScoreNote();
 	
 }
 
 
 void testApp::checkNewScoreNote(){