From 2145fd2973528b7f2b8b4c3cd090fcff23ff6722 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 15 Dec 2014 10:46:15 -0500
Subject: [PATCH] next 2 modifiers

---
 gtk2_ardour/dark.colors        | 8 ++++----
 gtk2_ardour/midi_streamview.cc | 2 +-
 gtk2_ardour/time_axis_view.cc  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index 1d54086838..7d62596656 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -89,7 +89,7 @@
     <Color name="color 73" value="0x3240c0ff"/>
     <Color name="color 74" value="0x7a9bccff"/>
     <Color name="color 75" value="0xbba900ff"/>
-    <Color name="color 76" value="0x6c6e6a6b"/>
+    <Color name="color 76" value="0x6c6e6aff"/>
     <Color name="color 77" value="0x7aadf9ff"/>
     <Color name="color 78" value="0x256f8fff"/>
     <Color name="color 79" value="0x254528ff"/>
@@ -110,7 +110,7 @@
     <Color name="color 92" value="0x8cd8f8ff"/>
     <Color name="color 93" value="0x51578aff"/>
     <Color name="color 94" value="0x636363ff"/>
-    <Color name="color 95" value="0xe4f4d377"/>
+    <Color name="color 95" value="0xe4f4d3ff"/>
     <Color name="color 96" value="0x85e524ff"/>
     <Color name="color 97" value="0xccccccff"/>
     <Color name="color 98" value="0x9effff7a"/>
@@ -495,8 +495,8 @@
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="midi track base" modifier="= alpha:0.3725"/>
     <Modifier name="panner fill" modifier="= alpha:0.7882"/>
-    <Modifier name="modifier 76" modifier="= alpha:0.4196"/>
-    <Modifier name="modifier 95" modifier="= alpha:0.4666"/>
+    <Modifier name="piano roll black" modifier="= alpha:0.4196"/>
+    <Modifier name="selection rect" modifier="= alpha:0.4666"/>
     <Modifier name="modifier 98" modifier="= alpha:0.4784"/>
   </Modifiers>
 </Ardour>
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 632a5bca50..e91a1c683d 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -333,7 +333,7 @@ MidiStreamView::draw_note_lines()
 		case 6:
 		case 8:
 		case 10:
-			color = ARDOUR_UI::config()->color ("piano roll black");
+			color = ARDOUR_UI::config()->color_mod ("piano roll black", "piano roll black");
 			break;
 		default:
 			color = ARDOUR_UI::config()->color_mod ("piano roll white", "piano roll white");
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 8f4f6f76ca..7130f9de68 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1025,7 +1025,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
 		rect->rect = new ArdourCanvas::TimeRectangle (selection_group);
 		CANVAS_DEBUG_NAME (rect->rect, "selection rect");
 		rect->rect->set_outline (false);
-		rect->rect->set_fill_color (ARDOUR_UI::config()->color ("selection rect"));
+		rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect"));
 
 		rect->start_trim = new ArdourCanvas::Rectangle (selection_group);
 		CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim");
@@ -1190,7 +1190,7 @@ TimeAxisView::color_handler ()
 
 	for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
 
-		(*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("selection rect"));
+		(*i)->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect"));
 		(*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection"));
 
 		(*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
@@ -1202,7 +1202,7 @@ TimeAxisView::color_handler ()
 	
 	for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
 		
-		(*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("selection rect"));
+		(*i)->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect"));
 		(*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection"));
 		
 		(*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
-- 
2.30.2