X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbutton_joiner.cc;h=da9ae4584744297719d65c1b3c0696218c86f08a;hb=5e7d9d30e28e8022661497244ccd43a1f5a836c6;hp=0c60cba1db40f8cf79987a0383c6d5770c3c14c3;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/button_joiner.cc b/gtk2_ardour/button_joiner.cc
index 0c60cba1db..da9ae45847 100644
--- 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;
@@ -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);