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

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index f1bf1127c4..11db73241c 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 */
 
 	{
@@ -1018,8 +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()) {
-				// why?  emit  ActiveChanged() ??
+				// emit ActiveChanged() and latency_changed() if needed
 				(*i)->activate ();
 			}
 
@@ -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()));
 	}
@@ -5267,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