From 07d3af8d880a148f56bd42e687036856928281e5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 24 Nov 2014 15:10:14 +0200
Subject: [PATCH] define and use two new colors for loop range marker, when
 active and not active

---
 gtk2_ardour/canvas_vars.h        |  2 ++
 gtk2_ardour/default_ui_config.in |  2 ++
 gtk2_ardour/editor_markers.cc    | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 12522169b0..2f6403d087 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -64,6 +64,8 @@ CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
 CANVAS_VARIABLE(canvasvar_LocationSelected, "location selected")
 CANVAS_VARIABLE(canvasvar_LocationOutline, "location outline")
 CANVAS_VARIABLE(canvasvar_LocationHandle, "location handle")
+CANVAS_VARIABLE(canvasvar_LoopRangeMarkerActive, "loop range marker: active")
+CANVAS_VARIABLE(canvasvar_LoopRangeMarkerInactive, "loop range marker: inactive")
 CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
 CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
 CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index e1cf9febd5..8afbfd53a8 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -57,6 +57,8 @@
     <Option name="location selected" value="1d9b9b60"/>
     <Option name="location outline" value="ffffff33"/>
     <Option name="location handle" value="ffffffcc"/>
+    <Option name="loop range marker: active" value="3453aecc"/>
+    <Option name="loop range marker: inactive" value="ae5334cc"/>
     <Option name="marker bar" value="575757ff"/>
     <Option name="marker bar separator" value="ffffff15"/>
     <Option name="marker drag line" value="004f00f9"/>
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 9e9e0d0351..128bcf5b92 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -36,6 +36,7 @@
 #include "canvas/rectangle.h"
 #include "canvas/utils.h"
 
+#include "ardour_ui.h"
 #include "editor.h"
 #include "marker.h"
 #include "selection.h"
@@ -109,7 +110,8 @@ Editor::add_new_location_internal (Location* location)
 
 		// no name shown ; actual marker is twice the height of the bar on which we drag, so that 
                 // it covers the ruler as well.
-		lam->start = new RulerMarker (location, *this, *ruler_group, ruler_height - ruler_divide_height, ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 0.4),
+		lam->start = new RulerMarker (location, *this, *ruler_group, ruler_height - ruler_divide_height, 
+                                              ARDOUR_UI::instance()->config()->get_canvasvar_LoopRangeMarkerInactive(),
                                               "", location->start(), location->end());
                 lam->end = 0;
 		group = ruler_group;
@@ -1169,6 +1171,7 @@ Editor::update_loop_range_view ()
 	}
 
 	Location* tll = transport_loop_location();
+        LocationMarkers* lam = find_location_markers (tll);
 
 	if (_session->get_play_loop() && tll) {
 
@@ -1179,8 +1182,17 @@ Editor::update_loop_range_view ()
 		transport_loop_range_rect->set_x1 (x2);
                 
 		transport_loop_range_rect->show();
+
+                if (lam) {
+                        lam->start->set_color (ARDOUR_UI::instance()->config()->get_canvasvar_LoopRangeMarkerActive());
+                }
+
 	} else {
 		transport_loop_range_rect->hide();
+
+                if (lam) {
+                        lam->start->set_color (ARDOUR_UI::instance()->config()->get_canvasvar_LoopRangeMarkerInactive());
+                }
 	}
 }