Factor out grid beat divisions.

[ardour.git] / gtk2_ardour / button_joiner.cc

diff --git a/gtk2_ardour/button_joiner.cc b/gtk2_ardour/button_joiner.cc
index 8671dab9ab309178f895e13b56c019db52676c41..da9ae4584744297719d65c1b3c0696218c86f08a 100644 (file)
--- a/gtk2_ardour/button_joiner.cc
+++ b/gtk2_ardour/button_joiner.cc
@@ -74,7 +74,7 @@ ButtonJoiner::ButtonJoiner (const std::string& str, Gtk::Widget& lw, Gtk::Widget
        uint32_t border_color;
        uint32_t r, g, b, a;
 
-       border_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", name));
+       border_color = ARDOUR_UI::config()->color (string_compose ("%1: border end", name));
        UINT_TO_RGBA (border_color, &r, &g, &b, &a);
        
        border_r = r/255.0;
@@ -99,7 +99,7 @@ ButtonJoiner::~ButtonJoiner ()
 }
 
 void
-ButtonJoiner::render (cairo_t* cr)
+ButtonJoiner::render (cairo_t* cr, cairo_rectangle_t*)
 {
        double h = get_height();
        
@@ -256,15 +256,15 @@ ButtonJoiner::set_colors ()
        active_fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
        inactive_fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
 
-       start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", name));
-       end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", name));
+       start_color = ARDOUR_UI::config()->color (string_compose ("%1: fill start", name));
+       end_color = ARDOUR_UI::config()->color (string_compose ("%1: fill end", name));
        UINT_TO_RGBA (start_color, &r, &g, &b, &a);
        cairo_pattern_add_color_stop_rgba (inactive_fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
        UINT_TO_RGBA (end_color, &r, &g, &b, &a);
        cairo_pattern_add_color_stop_rgba (inactive_fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
 
-       start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", name));
-       end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", name));
+       start_color = ARDOUR_UI::config()->color (string_compose ("%1: fill start active", name));
+       end_color = ARDOUR_UI::config()->color (string_compose ("%1: fill end active", name));
        UINT_TO_RGBA (start_color, &r, &g, &b, &a);
        cairo_pattern_add_color_stop_rgba (active_fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
        UINT_TO_RGBA (end_color, &r, &g, &b, &a);