From 7d32cf3813b7145b98c86b59867092e04aa2621a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 30 Aug 2011 09:48:53 +0000 Subject: Give route groups their own colour, settable from the route group dialogue. Americanise spelling of color in a few places to avoid confusion. Fixes #4224. Addresses parts of #2650 and #4064. git-svn-id: svn://localhost/ardour2/branches/3.0@10030 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/route_group.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libs/ardour/route_group.cc') diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index 7352112217..ef7e218d67 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -213,10 +213,14 @@ RouteGroup::get_max_factor(gain_t factor) } XMLNode& -RouteGroup::get_state (void) +RouteGroup::get_state () { XMLNode *node = new XMLNode ("RouteGroup"); + char buf[64]; + id().print (buf, sizeof (buf)); + node->add_property ("id", buf); + add_properties (*node); if (!routes->empty()) { @@ -239,10 +243,14 @@ RouteGroup::set_state (const XMLNode& node, int version) return set_state_2X (node, version); } - set_values (node); - const XMLProperty *prop; + if ((prop = node.property ("id")) != 0) { + _id = prop->value(); + } + + set_values (node); + if ((prop = node.property ("routes")) != 0) { stringstream str (prop->value()); vector ids; -- cgit v1.2.3