comparison src/testApp.cpp @ 50:93d21c20cfbc

Added Markers and the ability to switch to these points in the file when playing

 			printf("stop!\n");
 			eventMatcher.stopPlaying();
 			outputWriter.closeFile();
 		}
 		
+		if (m.getAddress() == "/marker"){
+			eventMatcher.goToMarker(m.getArgAsInt32(0));
+		}
+		
 		if ( m.getAddress() == "/accompanimentRatio" ){
 			double time = m.getArgAsFloat(0);
 			double ratio = m.getArgAsFloat(1);
 			eventMatcher.synchroniser.setPlayingRatio(ratio, time);
 		}

 	if (key == OF_KEY_LEFT){
 //		audioFilePlayer.loadedAudio.setPosition(max(0.0, audioFilePlayer.loadedAudio.getPosition() - (audioFilePlayer.fileLoader.audioHolder.audioScaleSamples/(4.0*audioFilePlayer.fileLoader.audioHolder.audioVector.size()))));
 		
 	}
 	
-	if (key == 'd'){
+	if (key == 'c'){
 		eventMatcher.useChromaDotProduct = !eventMatcher.useChromaDotProduct;
 		printf("Use dot product is %i\n", eventMatcher.useChromaDotProduct);
 	}
 	
 	if (key == ' '){
-
-		eventMatcher.recordedTracks.togglePlay();
+		if (!eventMatcher.startedPlaying){
+			eventMatcher.recordedTracks.togglePlay();
+		}
+	}
+	//Marker commands
+	if (key == 'm'){
+		eventMatcher.addMarkerNow();
+	}
+	
+	if (key == 'c'){
+		eventMatcher.deleteMarkers();
+	}
+	if (key == 'd'){
+		eventMatcher.deleteNearestMarker();
+	}
+	if (key == 's'){
+		eventMatcher.markedPoints.saveMarkers();
+	}
+	
+	
+	
+	
+	if (key == '.'){
+		eventMatcher.moveToNextMarker();
+	}
+	if (key == ','){
+		eventMatcher.moveToPreviousMarker();
 	}
 	
 	if (key == 'j'){
 		printf("dynamic vector scalar is %f\n", eventMatcher.bayesianStruct.posterior.scalar);
 	}

 	
 	if (key == OF_KEY_DOWN){
 		eventMatcher.recordedTracks.zoomIn();
 	}
 	
+	if (key == 'l')
+		eventMatcher.drawLikelihoods = !eventMatcher.drawLikelihoods;
+
 }
 
 //--------------------------------------------------------------
 void testApp::keyReleased  (int key){
 

 
 }
 
 //--------------------------------------------------------------
 void testApp::mousePressed(int x, int y, int button){
-
+	eventMatcher.mousePressed(x);
 }
 
 
 //--------------------------------------------------------------
 void testApp::mouseReleased(int x, int y, int button){