Add route group property to share route active state (#3703)

git-svn-id: svn://localhost/ardour2/branches/3.0@8497 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 30 insertions, 5 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 0bb9b69596..775b56a69b 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -84,7 +84,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	ChanCount n_outputs() const { return _output->n_ports(); }
 
 	bool active() const { return _active; }
-	void set_active (bool yn);
+	void set_active (bool yn, void *);
 
 	static std::string ensure_track_or_route_name(std::string, Session &);
 
diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 215f9f6bd7..44e191ab3f 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -43,6 +43,7 @@ namespace Properties {
 	extern PBD::PropertyDescriptor<bool> recenable;
 	extern PBD::PropertyDescriptor<bool> select;
 	extern PBD::PropertyDescriptor<bool> edit;
+	extern PBD::PropertyDescriptor<bool> route_active;
 	/* we use this, but its declared in region.cc */
 	extern PBD::PropertyDescriptor<bool> hidden;
 };
@@ -69,6 +70,7 @@ class RouteGroup : public SessionObject
 	bool is_recenable () const { return _recenable.val(); }
 	bool is_select () const { return _select.val(); }
 	bool is_edit () const { return _edit.val(); }
+	bool is_route_active () const { return _route_active.val(); }
 
 	bool empty() const {return routes->empty();}
 	size_t size() const { return routes->size();}
@@ -86,6 +88,7 @@ class RouteGroup : public SessionObject
 	void set_recenable (bool yn);
 	void set_select (bool yn);
 	void set_edit (bool yn);
+	void set_route_active (bool yn);
 
 	bool enabled_property (PBD::PropertyID);
 
@@ -137,6 +140,7 @@ private:
 	PBD::Property<bool> _recenable;
 	PBD::Property<bool> _select;
 	PBD::Property<bool> _edit;
+	PBD::Property<bool> _route_active;
 
 	void remove_when_going_away (boost::weak_ptr<Route>);
 	int set_state_2X (const XMLNode&, int);
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 25024b992a..71780870d1 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1964,7 +1964,7 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/)
 	if ((prop = node.property (X_("active"))) != 0) {
 		bool yn = string_is_affirmative (prop->value());
 		_active = !yn; // force switch
-		set_active (yn);
+		set_active (yn, this);
 	}
 
 	if ((prop = node.property (X_("meter-point"))) != 0) {
@@ -2210,7 +2210,7 @@ Route::_set_state_2X (const XMLNode& node, int version)
 			if ((prop = child->property (X_("active"))) != 0) {
 				bool yn = string_is_affirmative (prop->value());
 				_active = !yn; // force switch
-				set_active (yn);
+				set_active (yn, this);
 			}
 			
 			if ((prop = child->property (X_("gain"))) != 0) {
@@ -3399,8 +3399,13 @@ Route::denormal_protection () const
 }
 
 void
-Route::set_active (bool yn)
+Route::set_active (bool yn, void* src)
 {
+	if (_route_group && src != _route_group && _route_group->is_active() && _route_group->is_route_active()) {
+		_route_group->foreach_route (boost::bind (&Route::set_active, _1, yn, _route_group));
+		return;
+	}
+	
 	if (_active != yn) {
 		_active = yn;
 		_input->set_active (yn);
diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index 1fdccbd393..ce760563ac 100644
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -50,6 +50,7 @@ namespace ARDOUR {
 		PropertyDescriptor<bool> recenable;
 		PropertyDescriptor<bool> select;
 		PropertyDescriptor<bool> edit;
+		PropertyDescriptor<bool> route_active;
 	}	
 }
 
@@ -74,6 +75,8 @@ RouteGroup::make_property_quarks ()
         DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for select = %1\n", 	Properties::select.property_id));
 	Properties::edit.property_id = g_quark_from_static_string (X_("edit"));
         DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for edit = %1\n", 	Properties::edit.property_id));
+	Properties::route_active.property_id = g_quark_from_static_string (X_("route-active"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for route-active = %1\n", Properties::route_active.property_id));
 }
 
 #define ROUTE_GROUP_DEFAULT_PROPERTIES  _relative (Properties::relative, false) \
@@ -84,7 +87,8 @@ RouteGroup::make_property_quarks ()
 	, _solo (Properties::solo, false) \
 	, _recenable (Properties::recenable, false) \
 	, _select (Properties::select, false) \
-	, _edit (Properties::edit, false)
+	, _edit (Properties::edit, false) \
+	, _route_active (Properties::route_active, false)
 
 RouteGroup::RouteGroup (Session& s, const string &n)
 	: SessionObject (s, n)
@@ -102,6 +106,7 @@ RouteGroup::RouteGroup (Session& s, const string &n)
 	add_property (_recenable);
 	add_property (_select);
 	add_property (_edit);
+	add_property (_route_active);
 }
 
 RouteGroup::~RouteGroup ()
@@ -267,12 +272,14 @@ RouteGroup::set_state_2X (const XMLNode& node, int /*version*/)
 		_solo = true;
 		_recenable = true;
 		_edit = false;
+		_route_active = true;
 	} else if (node.name() == "EditGroup") {
 		_gain = false;
 		_mute = false;
 		_solo = false;
 		_recenable = false;
 		_edit = true;
+		_route_active = false;
 	}
 
 	return 0;
@@ -333,6 +340,15 @@ RouteGroup::set_edit (bool yn)
 }
 
 void
+RouteGroup::set_route_active (bool yn)
+{
+	if (is_route_active() == yn) {
+		return;
+	}
+	_route_active = yn;
+}
+
+void
 RouteGroup::set_active (bool yn, void* /*src*/)
 {
 	if (is_active() == yn) {