When printing an XML related error, guard against NULL pointers getting passed to...

[ardour.git] / gtk2_ardour / mixer_group_tabs.cc

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 7f9f1f0e5398df53f44e84c1cefc7643dee99502..4b33f1e34618c94bb619b0162ba653b2d97b4d37 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -23,7 +23,7 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/utils.h"
+#include "canvas/colors.h"
 
 #include "ardour_ui.h"
 #include "mixer_group_tabs.h"
@@ -103,7 +103,7 @@ MixerGroupTabs::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;
@@ -121,7 +121,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
                
-               ArdourCanvas::Color c = contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
+               ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
                ArdourCanvas::color_to_rgba (c, r, g, b, a);
 
                cairo_set_source_rgb (cr, r, g, b);
@@ -170,20 +170,6 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
        return routes;
 }
 
-PropertyList
-MixerGroupTabs::default_properties () const
-{
-       PropertyList plist;
-
-       plist.add (Properties::active, true);
-       plist.add (Properties::mute, true);
-       plist.add (Properties::solo, true);
-       plist.add (Properties::gain, true);
-       plist.add (Properties::recenable, true);
-
-       return plist;
-}
-
 RouteList
 MixerGroupTabs::selected_routes () const
 {