comparison src/AccompanimentSynchroniser.cpp @ 53:5274e3b5479d

Smoothed output, added tempo distribution variation to match the output

 //time sent is the live time since start of play
 
 AccompanimentSynchroniser::AccompanimentSynchroniser(){
 	sender.setup(HOST,  SENDER_PORT);
 	counter = 0;
+	movingAverageWeighting = 0.4;
 	reset();
 }
 
 void AccompanimentSynchroniser::reset(){
 	

 	
 	recordedPositionMillis = 0;
 	recordedPositionTimeSent = 0;
 	
 	speed = 1;
-	
+	smoothedSpeedOutput = 1;
+	difference = 0;
 	
 }
 
 void AccompanimentSynchroniser::setPlayingRatio(const double& ratio, const double& timePlayed){
 	playingPositionRatio = ratio;

 
 
 void AccompanimentSynchroniser::updateOutputSpeed(){
 	//we want the playing position to more closely align with the recordedPosition
 
-	
-	double difference = recordedPositionMillis - playingPositionMillis;
+
+	difference += 0.5*((recordedPositionMillis - playingPositionMillis)-difference);
 //	difference -=  (recordedPositionTimeSent - playingPositionTimeSent);
 	
 	//suppose we project that we will align in 1 seconds time
 	double projectedAlignmentTime = 1000;
 	
 	//then our current speed projects forward
-	double predictedPlayingTimeIncrease = projectedAlignmentTime*speed;
+	double predictedPlayingTimeIncrease = projectedAlignmentTime * smoothedSpeedOutput;//speed;
 	difference += (projectedAlignmentTime - predictedPlayingTimeIncrease);
-	double tmpSpeed = speed;
-	speed += difference/projectedAlignmentTime;
+	double tmpSpeed = smoothedSpeedOutput;
+	speed = smoothedSpeedOutput + (difference/projectedAlignmentTime);
 	
-	sendSpeed(speed);
+	smoothedSpeedOutput = movingAverageWeighting*speed + (1- movingAverageWeighting)*tmpSpeed;
+	
+	sendSpeed(smoothedSpeedOutput);
 	
 	if (counter % 10 == 0){
 		printf("SYNC: rec pos %f play pos %f, diff %f\n", recordedPositionMillis, playingPositionMillis, recordedPositionMillis - playingPositionMillis);
 		printf("projected align diff %f at speed %f\n", (projectedAlignmentTime - predictedPlayingTimeIncrease), tmpSpeed);
 		printf("Final difference %f and speed output %f\n\n", difference, speed);

 	if (val > -3 && val < 4){
 		ofxOscMessage m;
 		m.setAddress( "/setSpeed" );
 		m.addFloatArg( val );
 		sender.sendMessage( m );
+		
+		ofxOscMessage z;
+		z.setAddress( "/syncDifference" );
+		z.addFloatArg( difference );
+		sender.sendMessage( z );
 	}
 }