From ed5e141b7188187687bbbcd0dea5b3b74834ddd7 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 18 Oct 2010 22:02:12 +0000
Subject: [PATCH] if a clock is in delta-edit, it should be set to show a
 duration. this matters in BBT mode, where "zero" is 0|0|0 in duration mode
 and 1|1|0 otherwise. there is still a bug with the mouse tracking in delta
 edit mode, but that is a separate issue

git-svn-id: svn://localhost/ardour2/branches/3.0@7905 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour_ui_options.cc |  8 +++++++-
 gtk2_ardour/audio_clock.cc       | 11 +++++++++++
 gtk2_ardour/audio_clock.h        |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 8bd2508292..d4a681a165 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -29,6 +29,7 @@
 #include "ardour/configuration.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
+#include "ardour/rc_configuration.h"
 
 #ifdef HAVE_LIBLO
 #include "ardour/osc.h"
@@ -422,7 +423,12 @@ ARDOUR_UI::parameter_changed (std::string p)
 
 	} else if (p == "show-track-meters") {
 		editor->toggle_meter_updating();
-	}
+	} else if (p == "primary-clock-delta-edit-cursor") {
+                primary_clock.set_is_duration (Config->get_primary_clock_delta_edit_cursor());
+        } else if (p == "secondary-clock-delta-edit-cursor") {
+                secondary_clock.set_is_duration (Config->get_secondary_clock_delta_edit_cursor());
+        }
+
 }
 
 void
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 3201583e11..a7f57c6820 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -2126,3 +2126,14 @@ AudioClock::on_style_changed (const Glib::RefPtr<Style>& old_style)
 
 	set_size_requests ();
 }
+
+void
+AudioClock::set_is_duration (bool yn)
+{
+        if (yn == is_duration) {
+                return;
+        }
+        
+        is_duration = yn;
+        set (last_when, true, 0, 's');
+}
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index e5f0b0111a..915dbd79de 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -55,6 +55,7 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void locate ();
 	void set_mode (Mode);
 	void set_bbt_reference (framepos_t);
+        void set_is_duration (bool);
 
 	void set_widget_name (std::string);