Revert inadvertently pushed commit

[ardour.git] / gtk2_ardour / editor_group_tabs.cc

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index fff113a7e200b5fd1ceea96b04bfa4fe3e22d2ad..aa58ed2f129ef81482c97adaf3b3fd08c4bd7ec5 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -21,7 +21,7 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/utils.h"
+#include "canvas/colors.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -95,7 +95,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("inactive group tab"), r, g, b, a);
        }
 
        a = 1.0;
@@ -177,19 +177,6 @@ EditorGroupTabs::add_menu_items (Gtk::Menu* m, RouteGroup* g)
        }
 }
 
-PBD::PropertyList
-EditorGroupTabs::default_properties () const
-{
-       PBD::PropertyList plist;
-
-       plist.add (Properties::active, true);
-       plist.add (Properties::mute, true);
-       plist.add (Properties::solo, true);
-       plist.add (Properties::recenable, true);
-
-       return plist;
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {