more color/modifier tweaks

5 files changed, 13 insertions, 13 deletions

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index ca984ed128..d30cceccb7 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -80,7 +80,7 @@ AutomationRegionView::init (bool /*wfd*/)
 
 	set_height (trackview.current_height());
 
-	_fill_color_name = "midi frame base";
+	fill_color_name = "midi frame base";
 	set_colors ();
 
 	_enable_display = true;
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 330a2204bf..d88a1efb22 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -282,7 +282,7 @@ MidiRegionView::init (bool wfd)
 
 	_model = midi_region()->midi_source(0)->model();
 	_enable_display = false;
-	_fill_color_name = "midi frame base";
+	fill_color_name = "midi frame base";
 
 	RegionView::init (false);
 
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 127908613d..735e5dd09c 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -784,7 +784,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
 	bool me = false;
 
 	/* the color that will be used to show parts of regions that will not be heard */
-	uint32_t const non_playing_color = ARDOUR_UI::config()->color_mod ("covered region", "region base");
+	uint32_t const non_playing_color = ARDOUR_UI::config()->color_mod ("covered region", "covered region base");
 
 	while (t < end) {
 
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 35a1e33138..d9820cfec5 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -169,7 +169,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
 	group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
 
 	fill_color = base_color;
-	_fill_color_name = "region base";
+	fill_color_name = "time axis view item base";
 	samples_per_pixel = fpp;
 	frame_position = start;
 	item_duration = duration;
@@ -691,30 +691,30 @@ TimeAxisViewItem::set_name_text_color ()
 	name_text->set_color (ArdourCanvas::contrasting_text_color (f));
 }
 
-uint32_t
+ArdourCanvas::Color
 TimeAxisViewItem::get_fill_color () const
 {
-	uint32_t f;
+	ArdourCanvas::Color c;
+	const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
 
-	const std::string mod_name = (_dragging ? "dragging region" : _fill_color_name);
 	if (_selected) {
 
-		f = ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
+		c = ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
 
 	} else {
 
 		if (_recregion) {
-			f = ARDOUR_UI::config()->color ("recording rect");
+			c = ARDOUR_UI::config()->color ("recording rect");
 		} else {
 			if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-				f = ARDOUR_UI::config()->color_mod (_fill_color_name, mod_name);
+				c = ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
 			} else {
-				f = ARDOUR_UI::config()->color_mod (fill_color, mod_name);
+				c = ARDOUR_UI::config()->color_mod (fill_color, mod_name);
 			}
 		}
 	}
 
-	return f;
+	return c;
 }
 
 /**
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 9229a3c791..af08d9da33 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -235,7 +235,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 
 	double _height;
 	Visibility visibility;
-	std::string _fill_color_name;
+	std::string fill_color_name;
 	bool _recregion;
 	bool _automation; ///< true if this is an automation region view
 	bool _dragging;