X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Froute.cc;h=11db73241cbd304c629a556828f02611134678c9;hp=1600c3c9e88b7f7d2b88ded6469e6dd577ea633e;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=a223b96725c68a4e41c9f2f5675756c274730889

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 1600c3c9e8..11db73241c 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -74,7 +74,7 @@
 #include "ardour/utils.h"
 #include "ardour/vca.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -229,10 +229,6 @@ Route::init ()
 		_monitor_control->activate ();
 	}
 
-	if (is_master() || is_monitor() || is_auditioner()) {
-		_mute_master->set_solo_ignore (true);
-	}
-
 	/* now that we have _meter, its safe to connect to this */
 
 	{
@@ -415,6 +411,7 @@ Route::process_output_buffers (BufferSet& bufs,
 	bool const meter_already_run = metering_state() == MeteringInput;
 
 	framecnt_t latency = 0;
+	const double speed = _session.transport_speed ();
 
 	for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
 
@@ -444,8 +441,13 @@ Route::process_output_buffers (BufferSet& bufs,
 		if (boost::dynamic_pointer_cast<Send>(*i) != 0) {
 			boost::dynamic_pointer_cast<Send>(*i)->set_delay_in(_signal_latency - latency);
 		}
+		if (boost::dynamic_pointer_cast<PluginInsert>(*i) != 0) {
+			const framecnt_t longest_session_latency = _initial_delay + _signal_latency;
+			boost::dynamic_pointer_cast<PluginInsert>(*i)->set_sidechain_latency (
+					_initial_delay + latency, longest_session_latency - latency);
+		}
 
-		(*i)->run (bufs, start_frame - latency, end_frame - latency, nframes, *i != _processors.back());
+		(*i)->run (bufs, start_frame - latency, end_frame - latency, speed, nframes, *i != _processors.back());
 		bufs.set_count ((*i)->output_streams());
 
 		if ((*i)->active ()) {
@@ -473,6 +475,7 @@ Route::bounce_process (BufferSet& buffers, framepos_t start, framecnt_t nframes,
 	_trim->setup_gain_automation (start, start + nframes, nframes);
 
 	latency = 0;
+	const double speed = _session.transport_speed ();
 	for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
 
 		if (!include_endpoint && (*i) == endpoint) {
@@ -495,7 +498,7 @@ Route::bounce_process (BufferSet& buffers, framepos_t start, framecnt_t nframes,
 		 */
 		if ((*i) == _main_outs) {
 			assert ((*i)->does_routing());
-			(*i)->run (buffers, start - latency, start - latency + nframes, nframes, true);
+			(*i)->run (buffers, start - latency, start - latency + nframes, speed, nframes, true);
 			buffers.set_count ((*i)->output_streams());
 		}
 
@@ -503,7 +506,7 @@ Route::bounce_process (BufferSet& buffers, framepos_t start, framecnt_t nframes,
 		 * Also don't bother with metering.
 		 */
 		if (!(*i)->does_routing() && !boost::dynamic_pointer_cast<PeakMeter>(*i)) {
-			(*i)->run (buffers, start - latency, start - latency + nframes, nframes, true);
+			(*i)->run (buffers, start - latency, start - latency + nframes, 1.0, nframes, true);
 			buffers.set_count ((*i)->output_streams());
 			latency += (*i)->signal_latency ();
 		}
@@ -1011,7 +1014,12 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
 				}
 			}
 
+			if (pi && pi->has_sidechain ()) {
+				pi->sidechain_input ()->changed.connect_same_thread (*this, boost::bind (&Route::sidechain_change_handler, this, _1, _2));
+			}
+
 			if ((*i)->active()) {
+				// emit ActiveChanged() and latency_changed() if needed
 				(*i)->activate ();
 			}
 
@@ -1070,7 +1078,7 @@ Route::disable_processors (Placement p)
 	placement_range(p, start, end);
 
 	for (ProcessorList::iterator i = start; i != end; ++i) {
-		(*i)->deactivate ();
+		(*i)->enable (false);
 	}
 
 	_session.set_dirty ();
@@ -1084,7 +1092,7 @@ Route::disable_processors ()
 	Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
 	for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-		(*i)->deactivate ();
+		(*i)->enable (false);
 	}
 
 	_session.set_dirty ();
@@ -1103,7 +1111,7 @@ Route::disable_plugins (Placement p)
 
 	for (ProcessorList::iterator i = start; i != end; ++i) {
 		if (boost::dynamic_pointer_cast<PluginInsert> (*i)) {
-			(*i)->deactivate ();
+			(*i)->enable (false);
 		}
 	}
 
@@ -1119,7 +1127,7 @@ Route::disable_plugins ()
 
 	for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
 		if (boost::dynamic_pointer_cast<PluginInsert> (*i)) {
-			(*i)->deactivate ();
+			(*i)->enable (false);
 		}
 	}
 
@@ -1143,8 +1151,8 @@ Route::ab_plugins (bool forward)
 				continue;
 			}
 
-			if ((*i)->active()) {
-				(*i)->deactivate ();
+			if ((*i)->enabled ()) {
+				(*i)->enable (false);
 				(*i)->set_next_ab_is_active (true);
 			} else {
 				(*i)->set_next_ab_is_active (false);
@@ -1161,11 +1169,7 @@ Route::ab_plugins (bool forward)
 				continue;
 			}
 
-			if ((*i)->get_next_ab_is_active()) {
-				(*i)->activate ();
-			} else {
-				(*i)->deactivate ();
-			}
+			(*i)->enable ((*i)->get_next_ab_is_active ());
 		}
 	}
 
@@ -1406,7 +1410,7 @@ Route::replace_processor (boost::shared_ptr<Processor> old, boost::shared_ptr<Pr
 
 		ProcessorList::iterator i;
 		bool replaced = false;
-		bool enable = old->active ();
+		bool enable = old->enabled ();
 
 		for (i = _processors.begin(); i != _processors.end(); ) {
 			if (*i == old) {
@@ -1450,7 +1454,7 @@ Route::replace_processor (boost::shared_ptr<Processor> old, boost::shared_ptr<Pr
 		}
 
 		if (enable) {
-			sub->activate ();
+			sub->enable (true);
 		}
 
 		sub->ActiveChanged.connect_same_thread (*this, boost::bind (&Session::update_latency_compensation, &_session, false));
@@ -1619,8 +1623,8 @@ Route::try_configure_processors_unlocked (ChanCount in, ProcessorStreams* err)
 
 			if (boost::dynamic_pointer_cast<Delivery> (*p)
 					&& boost::dynamic_pointer_cast<Delivery> (*p)->role() == Delivery::Main
-					&& !(is_monitor() || is_auditioner())
-					&& ( _strict_io || Profile->get_mixbus ())) {
+					&& !is_auditioner()
+					&& (is_monitor() || _strict_io || Profile->get_mixbus ())) {
 				/* with strict I/O the panner + output are forced to
 				 * follow the last processor's output.
 				 *
@@ -1632,8 +1636,9 @@ Route::try_configure_processors_unlocked (ChanCount in, ProcessorStreams* err)
 				 * Delivery::configure_io() will do the actual removal
 				 * by calling _output->ensure_io()
 				 */
-				if (!is_master() && _session.master_out ()) {
-					/* ..but at least as many as there are master-inputs */
+				if (!is_master() && _session.master_out () && in.n_audio() > 0) {
+					/* ..but at least as many as there are master-inputs, if
+					 * the delivery is dealing with audio */
 					// XXX this may need special-casing for mixbus (master-outputs)
 					// and should maybe be a preference anyway ?!
 					out = ChanCount::max (in, _session.master_out ()->n_inputs ());
@@ -1824,12 +1829,7 @@ Route::all_visible_processors_active (bool state)
 		if (!(*i)->display_to_user() || boost::dynamic_pointer_cast<Amp> (*i)) {
 			continue;
 		}
-
-		if (state) {
-			(*i)->activate ();
-		} else {
-			(*i)->deactivate ();
-		}
+		(*i)->enable (state);
 	}
 
 	_session.set_dirty ();
@@ -2352,10 +2352,6 @@ Route::set_state (const XMLNode& node, int version)
 		_strict_io = string_is_affirmative (prop->value());
 	}
 
-	if (!can_solo()) {
-		_mute_master->set_solo_ignore (true);
-	}
-
 	if (is_monitor()) {
 		/* monitor bus does not get a panner, but if (re)created
 		   via XML, it will already have one by the time we
@@ -2394,22 +2390,6 @@ Route::set_state (const XMLNode& node, int version)
 			} else {
 				warning << string_compose (_("Pannable state found for route (%1) without a panner!"), name()) << endmsg;
 			}
-		}  else if (child->name() == Controllable::xml_node_name) {
-			if ((prop = child->property (X_("name"))) == 0) {
-				continue;
-			}
-
-			if (prop->value() == _gain_control->name()) {
-				_gain_control->set_state (*child, version);
-			} else if (prop->value() == _solo_control->name()) {
-				_solo_control->set_state (*child, version);
-			} else if (prop->value() == _solo_safe_control->name()) {
-				_solo_safe_control->set_state (*child, version);
-			} else if (prop->value() == _solo_isolate_control->name()) {
-				_solo_isolate_control->set_state (*child, version);
-			} else if (prop->value() == _solo_control->name()) {
-				_mute_control->set_state (*child, version);
-			}
 		} else if (child->name() == Slavable::xml_node_name) {
 			Slavable::set_state (*child, version);
 		}
@@ -2467,13 +2447,24 @@ Route::set_state (const XMLNode& node, int version)
 			XMLNode *cmt = *(child->children().begin());
 			_comment = cmt->content();
 
-		} else if (child->name() == Controllable::xml_node_name && (prop = child->property("name")) != 0) {
-			if (prop->value() == "solo") {
+		}  else if (child->name() == Controllable::xml_node_name) {
+			if ((prop = child->property (X_("name"))) == 0) {
+				continue;
+			}
+
+			if (prop->value() == _gain_control->name()) {
+				_gain_control->set_state (*child, version);
+			} else if (prop->value() == _solo_control->name()) {
 				_solo_control->set_state (*child, version);
-			} else if (prop->value() == "mute") {
+			} else if (prop->value() == _solo_safe_control->name()) {
+				_solo_safe_control->set_state (*child, version);
+			} else if (prop->value() == _solo_isolate_control->name()) {
+				_solo_isolate_control->set_state (*child, version);
+			} else if (prop->value() == _solo_control->name()) {
 				_mute_control->set_state (*child, version);
+			} else if (prop->value() == _phase_control->name()) {
+				_phase_control->set_state (*child, version);
 			}
-
 		} else if (child->name() == MuteMaster::xml_node_name) {
 			_mute_master->set_state (*child, version);
 
@@ -2507,10 +2498,6 @@ Route::set_state_2X (const XMLNode& node, int version)
 
 	Stripable::set_state (node, version);
 
-	if (is_master() || is_monitor() || is_auditioner()) {
-		_mute_master->set_solo_ignore (true);
-	}
-
 	if ((prop = node.property (X_("denormal-protection"))) != 0) {
 		set_denormal_protection (string_is_affirmative (prop->value()));
 	}
@@ -2885,6 +2872,8 @@ Route::silence_unlocked (framecnt_t nframes)
 {
 	/* Must be called with the processor lock held */
 
+	const framepos_t now = _session.transport_frame ();
+
 	if (!_silent) {
 
 		_output->silence (nframes);
@@ -2897,7 +2886,7 @@ Route::silence_unlocked (framecnt_t nframes)
 				continue;
 			}
 
-			(*i)->silence (nframes);
+			(*i)->silence (nframes, now);
 		}
 
 		if (nframes == _session.get_block_size()) {
@@ -3171,6 +3160,11 @@ Route::direct_feeds_according_to_reality (boost::shared_ptr<Route> other, bool*
 
 		if (iop != 0) {
 			boost::shared_ptr<const IO> iop_out = iop->output();
+			if (other.get() == this && iop_out && iop->input() && iop_out->connected_to (iop->input())) {
+				// TODO this needs a delaylines in the Insert to align connections (!)
+				DEBUG_TRACE (DEBUG::Graph,  string_compose ("\tIOP %1 does feed its own return (%2)\n", iop->name(), other->name()));
+				continue;
+			}
 			if ((iop_out && other->all_inputs().fed_by (iop_out)) || iop->feeds (other)) {
 				DEBUG_TRACE (DEBUG::Graph,  string_compose ("\tIOP %1 does feed %2\n", iop->name(), other->name()));
 				if (via_send_only) {
@@ -3389,6 +3383,22 @@ Route::pans_required () const
 	return max (n_inputs ().n_audio(), processor_max_streams.n_audio());
 }
 
+void
+Route::flush_processor_buffers_locked (framecnt_t nframes)
+{
+	for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+		boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
+		if (d) {
+			d->flush_buffers (nframes);
+		} else {
+			boost::shared_ptr<PortInsert> p = boost::dynamic_pointer_cast<PortInsert> (*i);
+			if (p) {
+				p->flush_buffers (nframes);
+			}
+		}
+	}
+}
+
 int
 Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool session_state_changing)
 {
@@ -3427,13 +3437,15 @@ Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	fill_buffers_with_input (bufs, _input, nframes);
 
 	if (_meter_point == MeterInput) {
-		_meter->run (bufs, start_frame, end_frame, nframes, true);
+		_meter->run (bufs, start_frame, end_frame, 0.0, nframes, true);
 	}
 
 	_amp->apply_gain_automation (false);
 	_trim->apply_gain_automation (false);
 	passthru (bufs, start_frame, end_frame, nframes, 0);
 
+	flush_processor_buffers_locked (nframes);
+
 	return 0;
 }
 
@@ -3467,11 +3479,13 @@ Route::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, in
 	fill_buffers_with_input (bufs, _input, nframes);
 
 	if (_meter_point == MeterInput) {
-		_meter->run (bufs, start_frame, end_frame, nframes, true);
+		_meter->run (bufs, start_frame, end_frame, 1.0, nframes, true);
 	}
 
 	passthru (bufs, start_frame, end_frame, nframes, declick);
 
+	flush_processor_buffers_locked (nframes);
+
 	return 0;
 }
 
@@ -3479,6 +3493,7 @@ int
 Route::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*end_frame*/, bool& /* need_butler */)
 {
 	silence (nframes);
+	flush_processor_buffers_locked (nframes);
 	return 0;
 }
 
@@ -3702,7 +3717,9 @@ Route::add_export_point()
 		Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
 		Glib::Threads::RWLock::WriterLock lw (_processor_lock);
 
-		_capturing_processor.reset (new CapturingProcessor (_session));
+		// this aligns all tracks; but not tracks + busses
+		assert (_session.worst_track_latency () >= _initial_delay);
+		_capturing_processor.reset (new CapturingProcessor (_session, _session.worst_track_latency () - _initial_delay));
 		_capturing_processor->activate ();
 
 		configure_processors_unlocked (0, &lw);
@@ -4480,10 +4497,17 @@ Route::setup_invisible_processors ()
 		new_processors.insert (amp, _monitor_control);
 	}
 
+	/* TRIM CONTROL */
+
+	if (_trim && _trim->active()) {
+		assert (!_trim->display_to_user ());
+		new_processors.push_front (_trim);
+	}
+
 	/* INTERNAL RETURN */
 
-	/* doing this here means that any monitor control will come just after
-	   the return.
+	/* doing this here means that any monitor control will come after
+	   the return and trim.
 	*/
 
 	if (_intreturn) {
@@ -4491,10 +4515,6 @@ Route::setup_invisible_processors ()
 		new_processors.push_front (_intreturn);
 	}
 
-	if (_trim && _trim->active()) {
-		assert (!_trim->display_to_user ());
-		new_processors.push_front (_trim);
-	}
 	/* EXPORT PROCESSOR */
 
 	if (_capturing_processor) {
@@ -4505,8 +4525,8 @@ Route::setup_invisible_processors ()
 	_processors = new_processors;
 
 	for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-		if (!(*i)->display_to_user () && !(*i)->active () && (*i) != _monitor_send) {
-			(*i)->activate ();
+		if (!(*i)->display_to_user () && !(*i)->enabled () && (*i) != _monitor_send) {
+			(*i)->enable (true);
 		}
 	}
 
@@ -5234,7 +5254,7 @@ Route::muted_by_others_soloing () const
 		return false;
 	}
 
-	return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated();
+	return  _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated();
 }
 
 void