Fix code style

[ardour.git] / libs / ardour / ardour / route_group.h

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 6fec1158c572e57a0a10cdc48f6562576fe249a9..a341721ae291df8b45196d99482eecc29c212e26 100644 (file)
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -38,17 +38,18 @@
 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;
 };
 
@@ -66,7 +67,7 @@ class Session;
  */
 class LIBARDOUR_API RouteGroup : public SessionObject
 {
-  public:
+public:
        static void make_property_quarks();
 
        RouteGroup (Session& s, const std::string &n);
@@ -83,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();}
@@ -128,7 +130,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
                changed();
        }
 
-        bool has_subgroup() const;
+       bool has_subgroup() const;
        void make_subgroup (bool, Placement);
        void destroy_subgroup ();
 
@@ -145,11 +147,22 @@ class LIBARDOUR_API RouteGroup : public SessionObject
 
        void assign_master (boost::shared_ptr<VCA>);
        void unassign_master (boost::shared_ptr<VCA>);
+       bool has_control_master() const;
        bool slaved () const;
 
-  private:
+       uint32_t rgba () const { return _rgba; }
+
+       /** set route-group color and notify UI about change */
+       void set_rgba (uint32_t);
+
+       /* directly set color only, used to convert old 5.x gui-object-state
+        * to libardour color */
+       void migrate_rgba (uint32_t color) { _rgba = color; }
+
+private:
        boost::shared_ptr<RouteList> routes;
-       boost::shared_ptr<Route> subgroup_bus;
+       boost::shared_ptr<Route> _subgroup_bus;
+       boost::weak_ptr<VCA> group_master;
 
        PBD::Property<bool> _relative;
        PBD::Property<bool> _active;
@@ -162,10 +175,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
        PBD::Property<bool> _route_active;
        PBD::Property<bool> _color;
        PBD::Property<bool> _monitoring;
-
-       bool pre_master_gain;
-       bool pre_master_solo;
-       bool pre_master_mute;
+       PBD::Property<int32_t> _group_master_number;
 
        boost::shared_ptr<ControlGroup> _solo_group;
        boost::shared_ptr<ControlGroup> _mute_group;
@@ -178,6 +188,9 @@ class LIBARDOUR_API RouteGroup : public SessionObject
 
        void post_set (PBD::PropertyChange const &);
        void push_to_groups ();
+
+       uint32_t _rgba;
+       bool _used_to_share_gain;
 };
 
 } /* namespace */