X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmtc_slave.cc;h=5edb5583f71055e108ef6f6c798d9709c6f9d0b8;hb=a473d630eb165272992e90f8d854b1d66ec0be63;hp=c713925475a26eda9391044a494b37a93e2d7c37;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index c713925475..5edb5583f7 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -21,6 +21,7 @@
 #include <poll.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/failed_constructor.h"
@@ -55,9 +56,11 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
 {
 	can_notify_on_unknown_rate = true;
 	did_reset_tc_format = false;
+	reset_pending = 0;
+	reset_position = false;
 
 	pic = new PIChaser();
-	
+
 	last_mtc_fps_byte = session.get_mtc_timecode_bits ();
 	mtc_frame = 0;
 
@@ -65,7 +68,7 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
 	speed_accumulator = new double[speed_accumulator_size];
 
 	rebind (p);
-	reset ();
+	reset (true);
 }
 
 MTC_Slave::~MTC_Slave()
@@ -78,36 +81,35 @@ MTC_Slave::~MTC_Slave()
 	delete [] speed_accumulator;
 }
 
-bool 
+bool
 MTC_Slave::give_slave_full_control_over_transport_speed() const
 {
-	// return true; // for PiC control */
-	return false; // for Session-level computed varispeed
+	return true; // for PiC control */
+	// return false; // for Session-level computed varispeed
 }
 
 void
 MTC_Slave::rebind (MIDI::Port& p)
 {
 	port_connections.drop_connections ();
-	
+
 	port = &p;
-	
-	port->input()->mtc_time.connect_same_thread (port_connections,  boost::bind (&MTC_Slave::update_mtc_time, this, _1, _2, _3));
-	port->input()->mtc_qtr.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_qtr, this, _1, _2, _3));
-	port->input()->mtc_status.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_status, this, _1));
+
+	port->parser()->mtc_time.connect_same_thread (port_connections,  boost::bind (&MTC_Slave::update_mtc_time, this, _1, _2, _3));
+	port->parser()->mtc_qtr.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_qtr, this, _1, _2, _3));
+	port->parser()->mtc_status.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_status, this, _1));
 }
 
 void
-MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, nframes_t now)
+MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, framepos_t now)
 {
-	maybe_reset ();
-
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("qtr frame %1 at %2\n", which_qtr, now));
+	maybe_reset ();
 	last_inbound_frame = now;
 }
 
 void
-MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
+MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 {
 	/* "now" can be zero if this is called from a context where we do not have or do not want
 	   to use a timestamp indicating when this MTC time was received. example: when we received
@@ -121,10 +123,10 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
 	Timecode::Time timecode;
 	TimecodeFormat tc_format;
 	bool reset_tc = true;
-	nframes64_t window_root = -1;
+	framepos_t window_root = -1;
 
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("full mtc time known at %1, full ? %2\n", now, was_full));
-	
+
 	timecode.hours = msg[3];
 	timecode.minutes = msg[2];
 	timecode.seconds = msg[1];
@@ -178,7 +180,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
 		session.config.set_timecode_format (tc_format);
 	}
 
-	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC time timestamp = %1 TC %2 = frame %3 (from full message ? %4)\n", 
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC time timestamp = %1 TC %2 = frame %3 (from full message ? %4)\n",
 						 now, timecode, mtc_frame, was_full));
 
 	if (was_full || outside_window (mtc_frame)) {
@@ -187,30 +189,30 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
 		session.request_locate (mtc_frame, false);
 		session.request_transport_speed (0);
 		update_mtc_status (MIDI::MTC_Stopped);
+		reset (false);
 		reset_window (mtc_frame);
-		reset ();
 
 	} else {
-			
+
 		/* we've had the first set of 8 qtr frame messages, determine position
 		   and allow continuing qtr frame messages to provide position
 		   and speed information.
 		*/
-		
+
 		/* do a careful conversion of the timecode value to a position
-		   so that we take drop/nondrop and all that nonsense into 
+		   so that we take drop/nondrop and all that nonsense into
 		   consideration.
 		*/
 
 		session.timecode_to_sample (timecode, mtc_frame, true, false);
-		
+
 		/* We received the last quarter frame 7 quarter frames (1.75 mtc
 		   frames) after the instance when the contents of the mtc quarter
 		   frames were decided. Add time to compensate for the elapsed 1.75
 		   frames. Also compensate for audio latency.
 		*/
-		
-		mtc_frame += (long) (1.75 * session.frames_per_timecode_frame()) + session.worst_output_latency();
+
+		mtc_frame += (long) (1.75 * session.frames_per_timecode_frame()) + session.worst_playback_latency();
 
 
 		if (now) {
@@ -223,13 +225,13 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
 			} else {
 
 				if (give_slave_full_control_over_transport_speed()) {
-					/* PIC 
-					 * 
+					/* PIC
+					 *
 					 * its not the average, but we will assign it to current.speed below
 					 */
 
-				    static nframes64_t last_seen_timestamp = 0; 
-				    static nframes64_t last_seen_position = 0; 
+				    static framepos_t last_seen_timestamp = 0;
+				    static framepos_t last_seen_position = 0;
 
 				    if ((now - last_seen_timestamp) < 300) {
 					mtc_frame = (mtc_frame + last_seen_position)/2;
@@ -238,24 +240,24 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
 				    last_seen_timestamp = now;
 				    last_seen_position = mtc_frame;
 
-					
-					
+
+
 				} else {
 
-					/* Non-PiC 
+					/* Non-PiC
 					 */
 
-					nframes64_t time_delta = (now - last_mtc_timestamp);
-					
+					framepos_t time_delta = (now - last_mtc_timestamp);
+
 					if (time_delta != 0) {
 						double apparent_speed = (mtc_frame - last_mtc_frame) / (double) (time_delta);
-						
+
 						process_apparent_speed (apparent_speed);
 						DEBUG_TRACE (DEBUG::Slave, string_compose ("apparent speed was %1 average is now %2\n", apparent_speed, average_speed));
 					} else {
 						DEBUG_TRACE (DEBUG::Slave, string_compose ("no apparent calc, average is %1\n", average_speed));
 					}
-					
+
 					/* every second, recalibrate the starting point for the speed measurement */
 					if (mtc_frame - last_mtc_frame > session.frame_rate()) {
 						last_mtc_timestamp = now;
@@ -330,8 +332,6 @@ MTC_Slave::update_mtc_status (MIDI::MTC_Status status)
 	   and process() context (via ::speed_and_position())
 	*/
 
-
-	DEBUG_TRACE (DEBUG::MTC, string_compose ("new MTC status %1\n", enum_2_string (status)));
 	switch (status) {
 	case MTC_Stopped:
 		current.guard1++;
@@ -358,7 +358,7 @@ MTC_Slave::update_mtc_status (MIDI::MTC_Status status)
 		current.guard2++;
 		break;
 	}
-	
+
 }
 
 void
@@ -381,7 +381,7 @@ MTC_Slave::read_current (SafeTime *st) const
 bool
 MTC_Slave::locked () const
 {
-	return port->input()->mtc_locked();
+	return port->parser()->mtc_locked();
 }
 
 bool
@@ -391,11 +391,12 @@ MTC_Slave::ok() const
 }
 
 bool
-MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
+MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 {
-	nframes64_t now = session.engine().frame_time();
+	framepos_t now = session.engine().frame_time();
 	SafeTime last;
-	nframes_t elapsed;
+	framecnt_t elapsed;
+	bool in_control = false;
 
 	read_current (&last);
 
@@ -413,7 +414,7 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
 		pos = last.position;
 		session.request_locate (pos, false);
 		session.request_transport_speed (0);
-		queue_reset ();
+		queue_reset (false);
 		DEBUG_TRACE (DEBUG::MTC, "MTC not seen for 1/4 second - reset pending\n");
 		return false;
 	}
@@ -421,21 +422,23 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::speed_and_position %1 %2\n", last.speed, last.position));
 
 	if (give_slave_full_control_over_transport_speed()) {
-	    bool in_control = (session.slave_state() == Session::Running);
-	    nframes64_t pic_want_locate = 0; 
-	    //nframes64_t slave_pos = session.audible_frame();
-	    nframes64_t slave_pos = session.transport_frame();
-	    static double average_speed = 0;
-
-	    average_speed = pic->get_ratio (last.timestamp, last.position, slave_pos, in_control );
-	    pic_want_locate = pic->want_locate();
-
-	    if (in_control && pic_want_locate) {
-		last.speed = average_speed + (double) (pic_want_locate - session.transport_frame()) / (double)session.get_block_size();
-		std::cout << "locate req " << pic_want_locate << " speed: " << average_speed << "\n"; 
-	    } else {
-		last.speed = average_speed;
-	    }
+		in_control = (session.slave_state() == Session::Running);
+		framepos_t pic_want_locate = 0;
+		//framepos_t slave_pos = session.audible_frame();
+		framepos_t slave_pos = session.transport_frame();
+		static double average_speed = 0;
+
+		framepos_t ref_now = session.engine().frame_time_at_cycle_start();
+		average_speed = pic->get_ratio (last.timestamp, last.position, ref_now, slave_pos, in_control, session.engine().frames_per_cycle());
+
+		pic_want_locate = pic->want_locate();
+
+		if (in_control && pic_want_locate) {
+			last.speed = average_speed + (double) (pic_want_locate - session.transport_frame()) / (double)session.get_block_size();
+			std::cout << "locate req " << pic_want_locate << " speed: " << average_speed << "\n";
+		} else {
+			last.speed = average_speed;
+		}
 	}
 
 	if (last.speed == 0.0f) {
@@ -447,7 +450,7 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
 		/* scale elapsed time by the current MTC speed */
 
 		if (last.timestamp && (now > last.timestamp)) {
-			elapsed = (nframes_t) floor (last.speed * (now - last.timestamp));
+			elapsed = (framecnt_t) floor (last.speed * (now - last.timestamp));
 			DEBUG_TRACE (DEBUG::MTC, string_compose ("last timecode received @ %1, now = %2, elapsed frames = %3 w/speed= %4\n",
 								 last.timestamp, now, elapsed, last.speed));
 		} else {
@@ -457,51 +460,67 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
 
 	/* now add the most recent timecode value plus the estimated elapsed interval */
 
-	pos = last.position + elapsed; 
+	if (in_control) {
+		pos = session.transport_frame();
+	} else {
+		pos = last.position + elapsed;
+	}
+
 	speed = last.speed;
 
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::speed_and_position FINAL %1 %2\n", last.speed, pos));
 
+
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("last = %1 elapsed = %2 pos = %3 speed = %4\n", last.position, elapsed, pos, speed));
+
 	return true;
 }
 
-ARDOUR::nframes_t
-MTC_Slave::resolution() const
+ARDOUR::framecnt_t
+MTC_Slave::resolution () const
 {
-	return (nframes_t) session.frames_per_timecode_frame();
+	return (framecnt_t) session.frames_per_timecode_frame();
 }
 
 void
-MTC_Slave::queue_reset ()
+MTC_Slave::queue_reset (bool reset_pos)
 {
 	Glib::Mutex::Lock lm (reset_lock);
 	reset_pending++;
+	if (reset_pos) {
+		reset_position = true;
+	}
 }
 
 void
 MTC_Slave::maybe_reset ()
 {
-	reset_lock.lock ();
+	Glib::Mutex::Lock lm (reset_lock);
 
 	if (reset_pending) {
-		reset ();
+		reset (reset_position);
 		reset_pending = 0;
-	} 
-
-	reset_lock.unlock ();
+		reset_position = false;
+	}
 }
 
 void
-MTC_Slave::reset ()
+MTC_Slave::reset (bool with_position)
 {
-	port->input()->reset_mtc_state ();
-
-	last_inbound_frame = 0;
-	current.guard1++;
-	current.position = 0;
-	current.timestamp = 0;
-	current.speed = 0;
-	current.guard2++;
+	if (with_position) {
+		last_inbound_frame = 0;
+		current.guard1++;
+		current.position = 0;
+		current.timestamp = 0;
+		current.speed = 0;
+		current.guard2++;
+	} else {
+		last_inbound_frame = 0;
+		current.guard1++;
+		current.timestamp = 0;
+		current.speed = 0;
+		current.guard2++;
+	}
 
 	window_begin = 0;
 	window_end = 0;
@@ -516,15 +535,15 @@ MTC_Slave::reset ()
 }
 
 void
-MTC_Slave::reset_window (nframes64_t root)
+MTC_Slave::reset_window (framepos_t root)
 {
-	
+
 	/* if we're waiting for the master to catch us after seeking ahead, keep the window
 	   of acceptable MTC frames wide open. otherwise, shrink it down to just 2 video frames
 	   ahead of the window root (taking direction into account).
 	*/
 
-	switch (port->input()->mtc_running()) {
+	switch (port->parser()->mtc_running()) {
 	case MTC_Forward:
 		window_begin = root;
 		if (session.slave_state() == Session::Running) {
@@ -532,12 +551,11 @@ MTC_Slave::reset_window (nframes64_t root)
 		} else {
 			window_end = root + seekahead_distance ();
 		}
-		DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
 		break;
 
 	case MTC_Backward:
 		if (session.slave_state() == Session::Running) {
-			nframes_t d = session.frames_per_timecode_frame() * frame_tolerance;
+			framecnt_t const d = session.frames_per_timecode_frame() * frame_tolerance;
 			if (root > d) {
 				window_begin = root - d;
 				window_end = root;
@@ -545,7 +563,7 @@ MTC_Slave::reset_window (nframes64_t root)
 				window_begin = 0;
 			}
 		} else {
-			nframes_t d = seekahead_distance ();
+			framecnt_t const d = seekahead_distance ();
 			if (root > d) {
 				window_begin = root - d;
 			} else {
@@ -553,16 +571,17 @@ MTC_Slave::reset_window (nframes64_t root)
 			}
 		}
 		window_end = root;
-		DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
 		break;
-		
+
 	default:
 		/* do nothing */
 		break;
 	}
+
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
 }
 
-nframes64_t
+ARDOUR::framecnt_t
 MTC_Slave::seekahead_distance () const
 {
 	/* 1 second */
@@ -570,7 +589,7 @@ MTC_Slave::seekahead_distance () const
 }
 
 bool
-MTC_Slave::outside_window (nframes64_t pos) const
+MTC_Slave::outside_window (framepos_t pos) const
 {
 	return ((pos < window_begin) || (pos > window_end));
 }