X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_process.cc;h=4876dc7931249953db79fe9b2c5047a3ae642da0;hb=bfca00efd29d49af5b5a5b95d84d1a21beb602a0;hp=342ae5c8a825e64d31713664d0493b565243d05f;hpb=10bdce85a0e7381d1b5db38e3640600c6fd3ec79;p=ardour.git

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 342ae5c8a8..4876dc7931 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -38,6 +38,7 @@
 #include "ardour/timestamps.h"
 #include "ardour/graph.h"
 #include "ardour/audio_port.h"
+#include "ardour/tempo.h"
 
 #include "midi++/manager.h"
 #include "midi++/mmc.h"
@@ -51,8 +52,9 @@ using namespace std;
 /** Called by the audio engine when there is work to be done with JACK.
  * @param nframes Number of frames to process.
  */
+
 void
-Session::process (nframes_t nframes)
+Session::process (pframes_t nframes)
 {
 	MIDI::Manager::instance()->cycle_start(nframes);
 
@@ -69,19 +71,23 @@ Session::process (nframes_t nframes)
 		}
 	}
 
-        _engine.main_thread()->get_buffers ();
+	_engine.main_thread()->get_buffers ();
 
 	(this->*process_function) (nframes);
 
-        _engine.main_thread()->drop_buffers ();
+	_engine.main_thread()->drop_buffers ();
 
 	// the ticker is for sending time information like MidiClock
-	nframes_t transport_frames = transport_frame();
-	BBT_Time  transport_bbt;
-	bbt_time(transport_frames, transport_bbt);
-	Timecode::Time transport_timecode;
-	timecode_time(transport_frames, transport_timecode);
-	tick (transport_frames, transport_bbt, transport_timecode); /* EMIT SIGNAL */
+	framepos_t transport_frames = transport_frame();
+	Timecode::BBT_Time transport_bbt;
+	try {
+		_tempo_map->bbt_time_rt (transport_frames, transport_bbt);
+		Timecode::Time transport_timecode;
+		timecode_time(transport_frames, transport_timecode);
+		tick (transport_frames, transport_bbt, transport_timecode); /* EMIT SIGNAL */
+	} catch (...) {
+		/* don't bother with a message */
+	}
 
 	SendFeedback (); /* EMIT SIGNAL */
 
@@ -89,15 +95,15 @@ Session::process (nframes_t nframes)
 }
 
 int
-Session::fail_roll (nframes_t nframes)
+Session::fail_roll (pframes_t nframes)
 {
 	return no_roll (nframes);
 }
 
 int
-Session::no_roll (nframes_t nframes)
+Session::no_roll (pframes_t nframes)
 {
-	nframes_t end_frame = _transport_frame + nframes; // FIXME: varispeed + no_roll ??
+	framepos_t end_frame = _transport_frame + nframes; // FIXME: varispeed + no_roll ??
 	int ret = 0;
 	bool declick = get_transport_declick_required();
 	boost::shared_ptr<RouteList> r = routes.reader ();
@@ -106,34 +112,33 @@ Session::no_roll (nframes_t nframes)
 		_click_io->silence (nframes);
 	}
 
-	route_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), actively_recording(), declick);
-        /*
-	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+	if (_process_graph->threads_in_use() > 0) {
+		DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n");
+		_process_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), declick);
+	} else {
+		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
-		if ((*i)->is_hidden()) {
-			continue;
-		}
+			if ((*i)->is_hidden()) {
+				continue;
+			}
 
-		(*i)->set_pending_declick (declick);
+			(*i)->set_pending_declick (declick);
 
-		if ((*i)->no_roll (nframes, _transport_frame, end_frame, non_realtime_work_pending(),
-				   actively_recording(), declick)) {
-			error << string_compose(_("Session: error in no roll for %1"), (*i)->name()) << endmsg;
-			ret = -1;
-			break;
+			if ((*i)->no_roll (nframes, _transport_frame, end_frame, non_realtime_work_pending())) {
+				error << string_compose(_("Session: error in no roll for %1"), (*i)->name()) << endmsg;
+				ret = -1;
+				break;
+			}
 		}
 	}
-        */
 
 	return ret;
 }
 
 int
-Session::process_routes (nframes_t nframes, bool& need_butler)
+Session::process_routes (pframes_t nframes, bool& need_butler)
 {
-	bool record_active;
 	int  declick = get_transport_declick_required();
-	bool rec_monitors = get_rec_monitors_input();
 	boost::shared_ptr<RouteList> r = routes.reader ();
 
 	if (transport_sub_state & StopPendingCapture) {
@@ -141,64 +146,68 @@ Session::process_routes (nframes_t nframes, bool& need_butler)
 		declick = -1;
 	}
 
-	record_active = actively_recording(); // || (get_record_enabled() && get_punch_in());
+	const framepos_t start_frame = _transport_frame;
+	const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed);
 
-	const nframes_t start_frame = _transport_frame;
-	const nframes_t end_frame = _transport_frame + (nframes_t)floor(nframes * _transport_speed);
+	/* XXX this is hack to force use of the graph even if we are only
+	   using 1 thread. its needed because otherwise when we remove
+	   tracks, the graph never gets updated.
+	*/
+	if (1 || _process_graph->threads_in_use() > 0) {
+		DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n");
+		_process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler);
+	} else {
 
-	route_graph->process_routes( nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler);
-/*
-	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
-		int ret;
+			int ret;
 
-		if ((*i)->is_hidden()) {
-			continue;
-		}
+			if ((*i)->is_hidden()) {
+				continue;
+			}
 
-		(*i)->set_pending_declick (declick);
+			(*i)->set_pending_declick (declick);
 
-		if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, record_active, rec_monitors, need_butler)) < 0) {
-			stop_transport ();
-			return -1;
+			if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, need_butler)) < 0) {
+				stop_transport ();
+				return -1;
+			}
 		}
 	}
-*/
+
 	return 0;
 }
 
 int
-Session::silent_process_routes (nframes_t nframes, bool& need_butler)
+Session::silent_process_routes (pframes_t nframes, bool& need_butler)
 {
-	bool record_active = actively_recording();
-	int  declick = get_transport_declick_required();
-	bool rec_monitors = get_rec_monitors_input();
 	boost::shared_ptr<RouteList> r = routes.reader ();
 
-	if (transport_sub_state & StopPendingCapture) {
-		/* force a declick out */
-		declick = -1;
-	}
-
-	const nframes_t start_frame = _transport_frame;
-	const nframes_t end_frame = _transport_frame + lrintf(nframes * _transport_speed);
+	const framepos_t start_frame = _transport_frame;
+	const framepos_t end_frame = _transport_frame + lrintf(nframes * _transport_speed);
 
-	route_graph->silent_process_routes( nframes, start_frame, end_frame, record_active, rec_monitors, need_butler);
-/*
-	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+	/* XXX this is hack to force use of the graph even if we are only
+	   using 1 thread. its needed because otherwise when we remove
+	   tracks, the graph never gets updated.
+	*/
+	if (1 || _process_graph->threads_in_use() > 0) {
+		_process_graph->silent_process_routes (nframes, start_frame, end_frame, need_butler);
+	} else {
+		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
-		int ret;
+			int ret;
 
-		if ((*i)->is_hidden()) {
-			continue;
-		}
+			if ((*i)->is_hidden()) {
+				continue;
+			}
 
-		if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, record_active, rec_monitors, need_butler)) < 0) {
-			stop_transport ();
-			return -1;
+			if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, need_butler)) < 0) {
+				stop_transport ();
+				return -1;
+			}
 		}
 	}
-*/
+
 	return 0;
 }
 
@@ -231,13 +240,12 @@ Session::get_track_statistics ()
 
 /** Process callback used when the auditioner is not active */
 void
-Session::process_with_events (nframes_t nframes)
+Session::process_with_events (pframes_t nframes)
 {
 	SessionEvent*  ev;
-	nframes_t      this_nframes;
+	pframes_t      this_nframes;
 	framepos_t     end_frame;
 	bool           session_needs_butler = false;
-	framepos_t     stop_limit;
 	framecnt_t     frames_moved;
 
 	/* make sure the auditioner is silent */
@@ -263,9 +271,39 @@ Session::process_with_events (nframes_t nframes)
 		process_event (ev);
 	}
 
-	/* Events caused a transport change, send an MTC Full Frame (Timecode) message.
-	 * This is sent whether rolling or not, to give slaves an idea of ardour time
-	 * on locates (and allow slow slaves to position and prepare for rolling)
+	/* Decide on what to do with quarter-frame MTC during this cycle */
+
+	bool const was_sending_qf_mtc = _send_qf_mtc;
+	double const tolerance = Config->get_mtc_qf_speed_tolerance() / 100.0;
+
+	if (_transport_speed != 0) {
+		_send_qf_mtc = (
+			Config->get_send_mtc () &&
+			_transport_speed >= (1 - tolerance) &&
+			_transport_speed <= (1 + tolerance)
+			);
+
+		if (_send_qf_mtc && !was_sending_qf_mtc) {
+			/* we will re-start quarter-frame MTC this cycle, so send a full update to set things up */
+			_send_timecode_update = true;
+		}
+
+		if (Config->get_send_mtc() && !_send_qf_mtc && _pframes_since_last_mtc > (frame_rate () / 4)) {
+			/* we're sending MTC, but we're not sending QF MTC at the moment, and it's been
+			   a quarter of a second since we sent anything at all, so send a full MTC update
+			   this cycle.
+			*/
+			_send_timecode_update = true;
+		}
+
+		_pframes_since_last_mtc += nframes;
+	}
+
+	/* Events caused a transport change (or we re-started sending
+	 * MTC), so send an MTC Full Frame (Timecode) message.  This
+	 * is sent whether rolling or not, to give slaves an idea of
+	 * ardour time on locates (and allow slow slaves to position
+	 * and prepare for rolling)
 	 */
 	if (_send_timecode_update) {
 		send_full_time_code (_transport_frame);
@@ -289,7 +327,7 @@ Session::process_with_events (nframes_t nframes)
 		frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
 	}
 
-	end_frame = _transport_frame + (nframes_t)frames_moved;
+	end_frame = _transport_frame + frames_moved;
 
 	{
 		SessionEvent* this_event;
@@ -312,19 +350,10 @@ Session::process_with_events (nframes_t nframes)
 		}
 
 		if (!_exporting && !timecode_transmission_suspended()) {
-			send_midi_time_code_for_cycle (nframes);
+			send_midi_time_code_for_cycle (_transport_frame, end_frame, nframes);
 		}
 
-		if (actively_recording()) {
-			stop_limit = max_framepos;
-		} else {
-
-			if (Config->get_stop_at_session_end()) {
-				stop_limit = current_end_frame();
-			} else {
-				stop_limit = max_framepos;
-			}
-		}
+		framepos_t stop_limit = compute_stop_limit ();
 
 		if (maybe_stop (stop_limit)) {
 			no_roll (nframes);
@@ -348,7 +377,7 @@ Session::process_with_events (nframes_t nframes)
 			if (this_event && this_event->action_frame <= end_frame && this_event->action_frame >= _transport_frame) {
 				/* this isn't quite right for reverse play */
 				frames_moved = (framecnt_t) (this_event->action_frame - _transport_frame);
-				this_nframes = (nframes_t) abs( floor(frames_moved / _transport_speed) );
+				this_nframes = abs (floor(frames_moved / _transport_speed));
 			}
 
 			if (this_nframes) {
@@ -397,8 +426,7 @@ Session::process_with_events (nframes_t nframes)
 			}
 
 			/* this is necessary to handle the case of seamless looping */
-			end_frame = _transport_frame + (nframes_t) floor (nframes * _transport_speed);
-
+			end_frame = _transport_frame + floor (nframes * _transport_speed);
 		}
 
 		set_next_event ();
@@ -432,11 +460,11 @@ Session::transport_locked () const
 }
 
 bool
-Session::follow_slave (nframes_t nframes)
+Session::follow_slave (pframes_t nframes)
 {
 	double slave_speed;
-	nframes64_t slave_transport_frame;
-	nframes_t this_delta;
+	framepos_t slave_transport_frame;
+	framecnt_t this_delta;
 	int dir;
 
 	if (!_slave->ok()) {
@@ -492,7 +520,7 @@ Session::follow_slave (nframes_t nframes)
 
 	DEBUG_TRACE (DEBUG::Slave, string_compose ("slave state %1 @ %2 speed %3 cur delta %4 avg delta %5\n",
 						   _slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta));
-		     
+
 
 	if (_slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) {
 
@@ -519,11 +547,11 @@ Session::follow_slave (nframes_t nframes)
 									   slave_speed,
 									   _transport_speed,
 									   _transport_frame,
-									   slave_transport_frame, 
+									   slave_transport_frame,
 									   average_slave_delta));
 			}
 #endif
-			
+
 			if (_slave->give_slave_full_control_over_transport_speed()) {
 				set_transport_speed (slave_speed, false, false);
 				//std::cout << "set speed = " << slave_speed << "\n";
@@ -534,9 +562,9 @@ Session::follow_slave (nframes_t nframes)
 									   delta, adjusted_speed, adjusted_speed/slave_speed, _transport_speed,
 									   slave_speed));
 			}
-			
+
 #if 1
-			if ((nframes_t) abs(average_slave_delta) > _slave->resolution()) {
+			if ((framecnt_t) abs(average_slave_delta) > _slave->resolution()) {
 				cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
 				goto silent_motion;
 			}
@@ -562,7 +590,7 @@ Session::follow_slave (nframes_t nframes)
 }
 
 void
-Session::calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta)
+Session::calculate_moving_average_of_slave_delta (int dir, framecnt_t this_delta)
 {
 	if (delta_accumulator_cnt >= delta_accumulator_size) {
 		have_first_delta_accumulator = true;
@@ -570,7 +598,7 @@ Session::calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta)
 	}
 
 	if (delta_accumulator_cnt != 0 || this_delta < _current_frame_rate) {
-		delta_accumulator[delta_accumulator_cnt++] = (nframes_t) dir *  (nframes_t) this_delta;
+		delta_accumulator[delta_accumulator_cnt++] = (framecnt_t) dir *  (framecnt_t) this_delta;
 	}
 
 	if (have_first_delta_accumulator) {
@@ -589,7 +617,7 @@ Session::calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta)
 }
 
 void
-Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame, nframes_t this_delta)
+Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame, framecnt_t /*this_delta*/)
 {
 	if (slave_speed != 0.0f) {
 
@@ -642,7 +670,7 @@ Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame,
 
 
 				bool ok = true;
-				nframes_t frame_delta = slave_transport_frame - _transport_frame;
+				framecnt_t frame_delta = slave_transport_frame - _transport_frame;
 
 				boost::shared_ptr<RouteList> rl = routes.reader();
 				for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -669,7 +697,6 @@ Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame,
 
 				memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size);
 				average_slave_delta = 0L;
-				this_delta = 0;
 			}
 		}
 
@@ -684,7 +711,7 @@ Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame,
 
 		if (_transport_speed != 0.0f) {
 			DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stops transport: %1 frame %2 tf %3\n", slave_speed, slave_transport_frame, _transport_frame));
-			stop_transport();
+			stop_transport ();
 		}
 
 		if (slave_transport_frame != _transport_frame) {
@@ -697,7 +724,7 @@ Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame,
 }
 
 void
-Session::follow_slave_silently (nframes_t nframes, float slave_speed)
+Session::follow_slave_silently (pframes_t nframes, float slave_speed)
 {
 	if (slave_speed && _transport_speed) {
 
@@ -722,28 +749,16 @@ Session::follow_slave_silently (nframes_t nframes, float slave_speed)
 		} else {
 			increment_transport_position (frames_moved);
 		}
-                
-		framepos_t stop_limit;
-
-		if (actively_recording()) {
-			stop_limit = max_framepos;
-		} else {
-			if (Config->get_stop_at_session_end()) {
-				stop_limit = current_end_frame();
-			} else {
-				stop_limit = max_framepos;
-			}
-		}
 
+		framepos_t const stop_limit = compute_stop_limit ();
 		maybe_stop (stop_limit);
 	}
 }
 
 void
-Session::process_without_events (nframes_t nframes)
+Session::process_without_events (pframes_t nframes)
 {
 	bool session_needs_butler = false;
-	framepos_t stop_limit;
 	framecnt_t frames_moved;
 
 	if (!process_can_proceed()) {
@@ -762,20 +777,20 @@ Session::process_without_events (nframes_t nframes)
 		return;
 	}
 
-	if (!_exporting && !timecode_transmission_suspended()) {
-		send_midi_time_code_for_cycle (nframes);
+	if (_transport_speed == 1.0) {
+		frames_moved = (framecnt_t) nframes;
+	} else {
+		interpolation.set_target_speed (fabs(_target_transport_speed));
+		interpolation.set_speed (fabs(_transport_speed));
+		frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
 	}
 
-	if (actively_recording()) {
-		stop_limit = max_framepos;
-	} else {
-		if (Config->get_stop_at_session_end()) {
-			stop_limit = current_end_frame();
-		} else {
-			stop_limit = max_framepos;
-		}
+	if (!_exporting && !timecode_transmission_suspended()) {
+		send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes);
 	}
 
+	framepos_t const stop_limit = compute_stop_limit ();
+
 	if (maybe_stop (stop_limit)) {
 		fail_roll (nframes);
 		return;
@@ -787,14 +802,6 @@ Session::process_without_events (nframes_t nframes)
 
 	click (_transport_frame, nframes);
 
-	if (_transport_speed == 1.0) {
-		frames_moved = (framecnt_t) nframes;
-	} else {
-		interpolation.set_target_speed (fabs(_target_transport_speed));
-		interpolation.set_speed (fabs(_transport_speed));
-		frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
-	}
-
 	if (process_routes (nframes, session_needs_butler)) {
 		fail_roll (nframes);
 		return;
@@ -802,6 +809,16 @@ Session::process_without_events (nframes_t nframes)
 
 	get_track_statistics ();
 
+	/* XXX: I'm not sure whether this is correct, but at least it
+	   matches process_with_events, so that this new frames_moved
+	   is -ve when transport speed is -ve.  This means that the
+	   transport position is updated correctly when we are in
+	   reverse.  It seems a bit wrong that we're not using the
+	   interpolator to compute this.
+	*/
+
+	frames_moved = (framecnt_t) floor (_transport_speed * nframes);
+
 	if (frames_moved < 0) {
 		decrement_transport_position (-frames_moved);
 	} else {
@@ -820,7 +837,7 @@ Session::process_without_events (nframes_t nframes)
  * @param nframes number of frames to process.
  */
 void
-Session::process_audition (nframes_t nframes)
+Session::process_audition (pframes_t nframes)
 {
 	SessionEvent* ev;
 	boost::shared_ptr<RouteList> r = routes.reader ();
@@ -837,12 +854,12 @@ Session::process_audition (nframes_t nframes)
 		_butler->summon ();
 	}
 
-        /* if using a monitor section, run it because otherwise we don't hear anything */
+	/* if using a monitor section, run it because otherwise we don't hear anything */
+
+	if (auditioner->needs_monitor()) {
+		_monitor_out->passthru (_transport_frame, _transport_frame + nframes, nframes, false);
+	}
 
-        if (auditioner->needs_monitor()) {
-                _monitor_out->passthru (_transport_frame, _transport_frame + nframes, nframes, false);
-        }
-        
 	/* handle pending events */
 
 	while (pending_events.read (&ev, 1) == 1) {
@@ -867,9 +884,9 @@ Session::process_audition (nframes_t nframes)
 }
 
 bool
-Session::maybe_sync_start (nframes_t& nframes)
+Session::maybe_sync_start (pframes_t & nframes)
 {
-	nframes_t sync_offset;
+	pframes_t sync_offset;
 
 	if (!waiting_for_sync_offset) {
 		return false;
@@ -884,7 +901,7 @@ Session::maybe_sync_start (nframes_t& nframes)
 
 		no_roll (sync_offset);
 		nframes -= sync_offset;
-		AudioPort::increment_port_offset (sync_offset);
+		Port::increment_global_port_buffer_offset (sync_offset);
 		waiting_for_sync_offset = false;
 
 		if (nframes == 0) {
@@ -1091,13 +1108,13 @@ Session::process_event (SessionEvent* ev)
 		del = false; // other side of RT request needs to clean up
 		break;
 
-        case SessionEvent::AdjustPlaybackBuffering:
-                schedule_playback_buffering_adjustment ();
-                break;
+	case SessionEvent::AdjustPlaybackBuffering:
+		schedule_playback_buffering_adjustment ();
+		break;
 
-        case SessionEvent::AdjustCaptureBuffering:
-                schedule_capture_buffering_adjustment ();
-                break;
+	case SessionEvent::AdjustCaptureBuffering:
+		schedule_capture_buffering_adjustment ();
+		break;
 
 	case SessionEvent::SetTimecodeTransmission:
 		g_atomic_int_set (&_suspend_timecode_transmission, ev->yes_or_no ? 0 : 1);
@@ -1118,3 +1135,26 @@ Session::process_event (SessionEvent* ev)
 	}
 }
 
+framepos_t
+Session::compute_stop_limit () const
+{
+	if (!Config->get_stop_at_session_end ()) {
+		return max_framepos;
+	}
+	
+	bool const punching_in = (config.get_punch_in () && _locations->auto_punch_location());
+	bool const punching_out = (config.get_punch_out () && _locations->auto_punch_location());
+
+	if (actively_recording ()) {
+		/* permanently recording */
+		return max_framepos;
+	} else if (punching_in && !punching_out) {
+		/* punching in but never out */
+		return max_framepos;
+	} else if (punching_in && punching_out && _locations->auto_punch_location()->end() > current_end_frame()) {
+		/* punching in and punching out after session end */
+		return max_framepos;
+	}
+
+	return current_end_frame ();
+}