initial pass to replace all UIConfiguration::get_XXXXXX() calls with UIConfiguration::color(name).

IMPORTANT: names have not been downcased and spaced yet, so many colors are not found

1 files changed, 35 insertions, 35 deletions

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index c27c0d833a..ad808154aa 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -69,7 +69,7 @@ Editor::initialize_canvas ()
 	_track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment);
 	_track_canvas = _track_canvas_viewport->canvas ();
 
-        _track_canvas->set_background_color (ARDOUR_UI::config()->get_ArrangeBase());
+        _track_canvas->set_background_color (ARDOUR_UI::config()->color ("ArrangeBase"));
 
 	/* scroll group for items that should not automatically scroll
 	 *  (e.g verbose cursor). It shares the canvas coordinate space.
@@ -871,8 +871,8 @@ Editor::set_horizontal_position (double p)
 void
 Editor::color_handler()
 {
-	ArdourCanvas::Color base = ARDOUR_UI::config()->get_RulerBase();
-	ArdourCanvas::Color text = ARDOUR_UI::config()->get_RulerText();
+	ArdourCanvas::Color base = ARDOUR_UI::config()->color ("RulerBase");
+	ArdourCanvas::Color text = ARDOUR_UI::config()->color ("RulerText");
 	timecode_ruler->set_fill_color (base);
 	timecode_ruler->set_outline_color (text);
 	minsec_ruler->set_fill_color (base);
@@ -882,52 +882,52 @@ Editor::color_handler()
 	bbt_ruler->set_fill_color (base);
 	bbt_ruler->set_outline_color (text);
 	
-	playhead_cursor->set_color (ARDOUR_UI::config()->get_PlayHead());
+	playhead_cursor->set_color (ARDOUR_UI::config()->color ("PlayHead"));
 
-	meter_bar->set_fill_color (ARDOUR_UI::config()->get_MeterBar());
-	meter_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
+	meter_bar->set_fill_color (ARDOUR_UI::config()->color ("MeterBar"));
+	meter_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
 
-	tempo_bar->set_fill_color (ARDOUR_UI::config()->get_TempoBar());
-	tempo_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
+	tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("TempoBar"));
+	tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
 
-	marker_bar->set_fill_color (ARDOUR_UI::config()->get_MarkerBar());
-	marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
+	marker_bar->set_fill_color (ARDOUR_UI::config()->color ("MarkerBar"));
+	marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
 
-	cd_marker_bar->set_fill_color (ARDOUR_UI::config()->get_CDMarkerBar());
-	cd_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
+	cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("CDMarkerBar"));
+	cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
 
-	range_marker_bar->set_fill_color (ARDOUR_UI::config()->get_RangeMarkerBar());
-	range_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
+	range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("RangeMarkerBar"));
+	range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
 
-	transport_marker_bar->set_fill_color (ARDOUR_UI::config()->get_TransportMarkerBar());
-	transport_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
+	transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("TransportMarkerBar"));
+	transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
 
-	cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragBarRect());
-	cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragBarRect());
+	cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
+	cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
 
-	range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragBarRect());
-	range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragBarRect());
+	range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
+	range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
 
-	transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_TransportDragRect());
-	transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_TransportDragRect());
+	transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportDragRect"));
+	transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportDragRect"));
 
-	transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->get_TransportLoopRect());
-	transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->get_TransportLoopRect());
+	transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportLoopRect"));
+	transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportLoopRect"));
 
-	transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->get_TransportPunchRect());
-	transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->get_TransportPunchRect());
+	transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportPunchRect"));
+	transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportPunchRect"));
 
-	transport_punchin_line->set_outline_color (ARDOUR_UI::config()->get_PunchLine());
-	transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_PunchLine());
+	transport_punchin_line->set_outline_color (ARDOUR_UI::config()->color ("PunchLine"));
+	transport_punchout_line->set_outline_color (ARDOUR_UI::config()->color ("PunchLine"));
 
-	rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_RubberBandRect());
-	rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_RubberBandRect());
+	rubberband_rect->set_outline_color (ARDOUR_UI::config()->color ("RubberBandRect"));
+	rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->color ("RubberBandRect"));
 
-	location_marker_color = ARDOUR_UI::config()->get_LocationMarker();
-	location_range_color = ARDOUR_UI::config()->get_LocationRange();
-	location_cd_marker_color = ARDOUR_UI::config()->get_LocationCDMarker();
-	location_loop_color = ARDOUR_UI::config()->get_LocationLoop();
-	location_punch_color = ARDOUR_UI::config()->get_LocationPunch();
+	location_marker_color = ARDOUR_UI::config()->color ("LocationMarker");
+	location_range_color = ARDOUR_UI::config()->color ("LocationRange");
+	location_cd_marker_color = ARDOUR_UI::config()->color ("LocationCDMarker");
+	location_loop_color = ARDOUR_UI::config()->color ("LocationLoop");
+	location_punch_color = ARDOUR_UI::config()->color ("LocationPunch");
 
 	refresh_location_display ();