X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Froute_group.h;h=1285d3bc52201e227d18c01136aea33d068b1621;hb=a4a246b41d68012534fdc315c67e32c18a25ae8e;hp=95affaeaf5073925879b160194c1577fc36fc2a6;hpb=4f3f9662765d13c655fb54b2320ebd5587d7aac1;p=ardour.git

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 95affaeaf5..1285d3bc52 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -29,24 +29,27 @@
 #include "pbd/signals.h"
 #include "pbd/stateful.h"
 
-#include "ardour/libardour_visibility.h"
+#include "ardour/control_group.h"
 #include "ardour/types.h"
 #include "ardour/session_object.h"
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 namespace Properties {
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> relative;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_relative;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_gain;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_mute;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_solo;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_recenable;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_select;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_route_active;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_color;
+	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_monitoring;
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> active;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> gain;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> mute;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> solo;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> recenable;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> select;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> route_active;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> color;
-	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> monitoring;
-	/* we use this, but its declared in region.cc */
+	LIBARDOUR_API extern PBD::PropertyDescriptor<int32_t> group_master_number;
+	/* we use these declared in region.cc */
 	LIBARDOUR_API extern PBD::PropertyDescriptor<bool> hidden;
 };
 
@@ -73,7 +76,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
 	bool is_active () const { return _active.val(); }
 	bool is_relative () const { return _relative.val(); }
 	bool is_hidden () const { return _hidden.val(); }
-	bool is_gain () const { return _gain.val(); }
+	bool is_gain () const { return _gain.val() && _group_master_number.val() <= 0; }
 	bool is_mute () const { return _mute.val(); }
 	bool is_solo () const { return _solo.val(); }
 	bool is_recenable () const { return _recenable.val(); }
@@ -81,6 +84,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
 	bool is_route_active () const { return _route_active.val(); }
 	bool is_color () const { return _color.val(); }
 	bool is_monitoring() const { return _monitoring.val(); }
+	int32_t group_master_number() const { return _group_master_number.val(); }
 
 	bool empty() const {return routes->empty();}
 	size_t size() const { return routes->size();}
@@ -141,9 +145,15 @@ class LIBARDOUR_API RouteGroup : public SessionObject
 
 	int set_state (const XMLNode&, int version);
 
+	void assign_master (boost::shared_ptr<VCA>);
+	void unassign_master (boost::shared_ptr<VCA>);
+	bool has_control_master() const;
+	bool slaved () const;
+
   private:
 	boost::shared_ptr<RouteList> routes;
 	boost::shared_ptr<Route> subgroup_bus;
+	boost::weak_ptr<VCA> group_master;
 
 	PBD::Property<bool> _relative;
 	PBD::Property<bool> _active;
@@ -156,9 +166,19 @@ class LIBARDOUR_API RouteGroup : public SessionObject
 	PBD::Property<bool> _route_active;
 	PBD::Property<bool> _color;
 	PBD::Property<bool> _monitoring;
+	PBD::Property<int32_t> _group_master_number;
+
+	boost::shared_ptr<ControlGroup> _solo_group;
+	boost::shared_ptr<ControlGroup> _mute_group;
+	boost::shared_ptr<ControlGroup> _rec_enable_group;
+	boost::shared_ptr<ControlGroup> _gain_group;
+	boost::shared_ptr<ControlGroup> _monitoring_group;
 
 	void remove_when_going_away (boost::weak_ptr<Route>);
 	int set_state_2X (const XMLNode&, int);
+
+	void post_set (PBD::PropertyChange const &);
+	void push_to_groups ();
 };
 
 } /* namespace */