diff src/testApp.cpp @ 7:33dedfe32893

kick, snare and bass windowed. Likelihoods in dedicated screen regions
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Thu, 02 Feb 2012 21:55:51 +0000
parents 746a5af43c02
children 572564b7cb85
line wrap: on
line diff
--- a/src/testApp.cpp	Thu Feb 02 17:52:08 2012 +0000
+++ b/src/testApp.cpp	Thu Feb 02 21:55:51 2012 +0000
@@ -31,7 +31,7 @@
 	
 	eventMatcher.recordedTracks.loadTestAudio();
 	
-	
+	eventMatcher.setWindowDimensions();
 	//audioFilePlayer.loadAudioFile(infilename);
 }
 
@@ -66,15 +66,15 @@
 		//	float pitchIn = m.getArgAsFloat(0);
 			int testChannel = m.getArgAsInt32(0);
 			double timeIn = m.getArgAsInt32(1); 
-			printf("kick RECEIVED at time %f\n", timeIn);
+			printf("\nKICK RECEIVED at time %f\n", timeIn);
 			eventMatcher.newKickEvent(testChannel, timeIn);
 		}
 		
 		if ( m.getAddress() == "/snare" ){
-			//	float pitchIn = m.getArgAsFloat(0); 
-			double timeIn = m.getArgAsInt32(0); 
-			printf("snare RECEIVED at time %f\n", timeIn);
-			eventMatcher.newSnareEvent(timeIn);
+			int testChannel = m.getArgAsInt32(0);
+			double timeIn = m.getArgAsInt32(1);
+			printf("\nSNARE RECEIVED at time %f\n", timeIn);
+			eventMatcher.newSnareEvent(testChannel, timeIn);
 		}
 		
 		if ( m.getAddress() == "/start" ){