From e0080acc3cb6c439596e960af8de7660cf2f6cb1 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 24 Nov 2014 14:40:31 +0200
Subject: [PATCH] define and use 2 new colors for divider line in ruler

---
 gtk2_ardour/canvas_vars.h        | 2 ++
 gtk2_ardour/default_ui_config.in | 2 ++
 gtk2_ardour/editor_rulers.cc     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 4aa25d51dc..12522169b0 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -144,6 +144,8 @@ CANVAS_VARIABLE(canvasvar_RecWaveForm, "recorded waveform outline")
 CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
 CANVAS_VARIABLE(canvasvar_RulerBase, "ruler base")
 CANVAS_VARIABLE(canvasvar_RulerText, "ruler text")
+CANVAS_VARIABLE(canvasvar_RulerDividerTop, "ruler divider top")
+CANVAS_VARIABLE(canvasvar_RulerDividerBottom, "ruler divider bottom")
 CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
 CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
 CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index 65348cca2b..e1cf9febd5 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -135,6 +135,8 @@
     <Option name="rubber band rect" value="c6c6c659"/>
     <Option name="ruler base" value="575757ff"/>
     <Option name="ruler text" value="9C9C9Cff"/>
+    <Option name="ruler divider top" value="00ff00ff"/>
+    <Option name="ruler divider bottom" value="ff0000ff"/>
     <Option name="selected crossfade editor line" value="00dbdbff"/>
     <Option name="selected crossfade editor wave" value="f9ea14a0"/>
     <Option name="selected region base" value="5F5E5FFF"/>
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 76ae3363c3..f526d15050 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -145,6 +145,8 @@ Editor::initialize_rulers ()
 
         if (ruler_divide_height >= 0) {
                 clock_ruler->set_divide_height (ruler_divide_height);
+                clock_ruler->set_divide_colors (ARDOUR_UI::config()->get_canvasvar_RulerDividerTop(),
+                                                ARDOUR_UI::config()->get_canvasvar_RulerDividerBottom());
         }
 
         ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun (*this, &Editor::update_ruler_visibility));