NO-OP: whitespace

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

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index d965f180e80d0eff048f3a31de37924203db6a42..a309e28981e75f4771d523251c7375cad14e4628 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -24,6 +24,7 @@
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/strsplit.h"
+#include "pbd/types_convert.h"
 #include "pbd/debug.h"
 
 #include "ardour/amp.h"
@@ -108,6 +109,8 @@ RouteGroup::RouteGroup (Session& s, const string &n)
        , _rec_enable_group (new ControlGroup (RecEnableAutomation))
        , _gain_group (new GainControlGroup ())
        , _monitoring_group (new ControlGroup (MonitoringAutomation))
+       , _rgba (0)
+       , _used_to_share_gain (false)
 {
        _xml_node_name = X_("RouteGroup");
 
@@ -184,7 +187,7 @@ RouteGroup::add (boost::shared_ptr<Route> r)
        boost::shared_ptr<VCA> vca (group_master.lock());
 
        if (vca) {
-               r->assign  (vca, false);
+               r->assign (vca);
        }
 
        _session.set_dirty ();
@@ -233,15 +236,34 @@ RouteGroup::remove (boost::shared_ptr<Route> r)
        return -1;
 }
 
+void
+RouteGroup::set_rgba (uint32_t color) {
+       _rgba = color;
+
+       PBD::PropertyChange change;
+       change.add (Properties::color);
+       PropertyChanged (change);
+
+       if (!is_color ()) {
+               return;
+       }
+
+       for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+               (*i)->presentation_info().PropertyChanged (Properties::color);
+       }
+}
 
 XMLNode&
 RouteGroup::get_state ()
 {
        XMLNode *node = new XMLNode ("RouteGroup");
 
-       char buf[64];
-       id().print (buf, sizeof (buf));
-       node->add_property ("id", buf);
+       node->set_property ("id", id());
+       node->set_property ("rgba", _rgba);
+       node->set_property ("used-to-share-gain", _used_to_share_gain);
+       if (subgroup_bus) {
+               node->set_property ("subgroup-bus", subgroup_bus->id ());
+       }
 
        add_properties (*node);
 
@@ -252,7 +274,7 @@ RouteGroup::get_state ()
                        str << (*i)->id () << ' ';
                }
 
-               node->add_property ("routes", str.str());
+               node->set_property ("routes", str.str());
        }
 
        return *node;
@@ -265,13 +287,14 @@ RouteGroup::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       XMLProperty const * prop;
-
        set_id (node);
        set_values (node);
+       node.get_property ("rgba", _rgba);
+       node.get_property ("used-to-share-gain", _used_to_share_gain);
 
-       if ((prop = node.property ("routes")) != 0) {
-               stringstream str (prop->value());
+       std::string routes;
+       if (node.get_property ("routes", routes)) {
+               stringstream str (routes);
                vector<string> ids;
                split (str.str(), ids, ' ');
 
@@ -285,6 +308,14 @@ RouteGroup::set_state (const XMLNode& node, int version)
                }
        }
 
+       PBD::ID subgroup_id (0);
+       if (node.get_property ("subgroup-bus", subgroup_id)) {
+               boost::shared_ptr<Route> r = _session.route_by_id (subgroup_id);
+               if (r) {
+                       subgroup_bus = r;
+               }
+       }
+
        if (_group_master_number.val() > 0) {
                boost::shared_ptr<VCA> vca = _session.vca_manager().vca_by_number (_group_master_number.val());
                if (vca) {
@@ -333,9 +364,6 @@ RouteGroup::set_gain (bool yn)
        if (is_gain() == yn) {
                return;
        }
-       if (has_control_master()) {
-               return;
-       }
 
        _gain = yn;
        _gain_group->set_active (yn);
@@ -628,22 +656,14 @@ RouteGroup::assign_master (boost::shared_ptr<VCA> master)
        }
 
        for (RouteList::iterator r = routes->begin(); r != routes->end(); ++r) {
-               (*r)->assign (master, false);
-       }
-
-       bool used_to_share_gain = false;
-
-       if (is_gain()) {
-               used_to_share_gain = true;
+               (*r)->assign (master);
        }
 
        group_master = master;
        _group_master_number = master->number();
-       _gain_group->set_active (false);
 
-       if (used_to_share_gain) {
-               send_change (PropertyChange (Properties::group_gain));
-       }
+       _used_to_share_gain = is_gain ();
+       set_gain (false);
 }
 
 void
@@ -666,17 +686,7 @@ RouteGroup::unassign_master (boost::shared_ptr<VCA> master)
        group_master.reset ();
        _group_master_number = -1;
 
-       /* this is slightly tricky: is_gain() will return whether or not
-          the group is supposed to be sharing gain adjustment, and now that
-          we've reset _group_master_number to -1, it will reflect the user's
-          intentions correctly. Since there was a master before, and now there
-          is not, we are going to reactivate gain sharing ... and then tell
-          the world about it.
-       */
-       if (is_gain()) {
-               _gain_group->set_active (true);
-               send_change (PropertyChange (Properties::group_gain));
-       }
+       set_gain (_used_to_share_gain);
 }
 
 bool