save and restore vca assignments

1 files changed, 1 insertions, 43 deletions

diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc
index 3ffeb057da..ef560085cc 100644
--- a/libs/ardour/gain_control.cc
+++ b/libs/ardour/gain_control.cc
@@ -178,48 +178,6 @@ GainControl::get_state ()
 int
 GainControl::set_state (XMLNode const& node, int version)
 {
-	AutomationControl::set_state (node, version);
-
-#if 0
-	XMLProperty const* prop = node.property (X_("masters"));
-
-	/* Problem here if we allow VCA's to be slaved to other VCA's .. we
-	 * have to load all VCAs first, then set up slave/master relationships
-	 * once we have them all.
-	 */
-
-	if (prop) {
-		masters_string = prop->value ();
-
-		if (_session.vca_manager().vcas_loaded()) {
-			vcas_loaded ();
-		} else {
-			_session.vca_manager().VCAsLoaded.connect_same_thread (vca_loaded_connection, boost::bind (&GainControl::vcas_loaded, this));
-		}
-	}
-#endif
-
-	return 0;
-}
-
-void
-GainControl::vcas_loaded ()
-{
-	if (masters_string.empty()) {
-		return;
-	}
-
-	vector<string> masters;
-	split (masters_string, masters, ',');
-
-	for (vector<string>::const_iterator m = masters.begin(); m != masters.end(); ++m) {
-		boost::shared_ptr<VCA> vca = _session.vca_manager().vca_by_number (PBD::atoi (*m));
-		if (vca) {
-			add_master (vca->gain_control());
-		}
-	}
-
-	vca_loaded_connection.disconnect ();
-	masters_string.clear ();
+	return AutomationControl::set_state (node, version);
 }