X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Froute.cc;h=36d1791f9f22afff3787be34ff37eb1421702aa3;hb=52d746c5fb39263a42dd33de12e101c3fbeafaa9;hp=e59677f44ccd28b78b159d6da9e03e4ea6d23759;hpb=19a9d8415f2b63ce96fe25847553f4169e62804b;p=ardour.git

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index e59677f44c..36d1791f9f 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -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 */
 
 	{
@@ -2352,10 +2348,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 +2386,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 +2443,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 +2494,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()));
 	}
@@ -3174,6 +3157,7 @@ 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;
 			}
@@ -4509,10 +4493,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) {
@@ -4520,10 +4511,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) {
@@ -5263,7 +5250,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