summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_ui.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-12-26 23:49:34 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-12-26 23:49:34 +0000
commit728374810d4cb9777924d8be0247b938dc77f7a0 (patch)
tree1349976790d77aa16515a972eabb32e078f2d9dd /gtk2_ardour/route_ui.cc
parentd1c6e8b6d805b2f74fe12ed42bc1f416ddd48674 (diff)
revert previous change- semantic confusion
git-svn-id: svn://localhost/ardour2/branches/3.0@13736 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
-rw-r--r--gtk2_ardour/route_ui.cc24
1 files changed, 10 insertions, 14 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 9b6e25cbc5..93af877b66 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1341,20 +1341,16 @@ RouteUI::set_color (const Gdk::Color & c)
* own pre-group colors.
*/
- if (g && g->is_color()) {
- GroupTabs::set_group_color (g, c);
- } else {
- char buf[64];
- _color = c;
- snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
-
- /* note: we use the route state ID here so that color is the same for both
- the time axis view and the mixer strip
- */
-
- gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
- _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
- }
+ char buf[64];
+ _color = c;
+ snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
+
+ /* note: we use the route state ID here so that color is the same for both
+ the time axis view and the mixer strip
+ */
+
+ gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
+ _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
}
/** @return GUI state ID for things that are common to the route in all its representations */