From c1b950373f9f33ef30c2df0da5e24953a8c6a25a Mon Sep 17 00:00:00 2001
From: nick_m <mainsbridge@gmail.com>
Date: Sat, 20 Aug 2016 05:41:12 +1000
Subject: Amend last commit - remove some code.

---
 gtk2_ardour/editor_mouse.cc | 24 ++++++++++++++++++++----
 gtk2_ardour/marker.cc       | 41 -----------------------------------------
 gtk2_ardour/marker.h        |  6 ------
 3 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 1bc242d3a2..01cb2175c1 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1754,7 +1754,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 			break;
 		}
 		entered_marker = m_marker;
-		m_marker->set_enter_color ();
+		if (m_marker->meter().position_lock_style() == MusicTime) {
+			m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker"));
+		} else {
+			m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
+		}
 		break;
 
 	case TempoMarkerItem:
@@ -1762,7 +1766,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 			break;
 		}
 		entered_marker = t_marker;
-		t_marker->set_enter_color ();
+		if (t_marker->tempo().position_lock_style() == MusicTime) {
+			t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
+		} else {
+			t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
+		}
 		break;
 
 	case FadeInHandleItem:
@@ -1878,7 +1886,11 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
 			break;
 		}
 		entered_marker = 0;
-		m_marker->set_leave_color ();
+		if (m_marker->meter().position_lock_style() == MusicTime) {
+			m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
+		} else {
+			m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker"));
+		}
 		break;
 
 	case TempoMarkerItem:
@@ -1886,7 +1898,11 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
 			break;
 		}
 		entered_marker = 0;
-		t_marker->set_leave_color ();
+		if (t_marker->tempo().position_lock_style() == MusicTime) {
+			t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
+		} else {
+			t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
+		}
 		break;
 
 	case FadeInTrimHandleItem:
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 9e05e1e4d6..1120043eb9 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -556,26 +556,6 @@ TempoMarker::update_height_mark (const double& ratio)
 	mark->set (*points);
 }
 
-void
-TempoMarker::set_enter_color ()
-{
-	if (_tempo.position_lock_style() == MusicTime) {
-		set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
-	} else {
-		set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
-	}
-}
-
-void
-TempoMarker::set_leave_color ()
-{
-	if (_tempo.position_lock_style() == MusicTime) {
-		set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
-	} else {
-		set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
-	}
-}
-
 /***********************************************************************/
 
 MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
@@ -590,24 +570,3 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent,
 MeterMarker::~MeterMarker ()
 {
 }
-
-void
-MeterMarker::set_enter_color ()
-{
-	if (_meter.position_lock_style() == MusicTime) {
-		set_color_rgba (UIConfiguration::instance().color ("meter marker"));
-	} else {
-		set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
-	}
-}
-
-void
-MeterMarker::set_leave_color ()
-{
-	if (_meter.position_lock_style() == MusicTime) {
-		set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
-	} else {
-		set_color_rgba (UIConfiguration::instance().color ("meter marker"));
-	}
-}
-
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index b7ef263833..becc809a74 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -146,9 +146,6 @@ class TempoMarker : public ArdourMarker
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
 
 	void update_height_mark (const double& ratio);
-	void set_enter_color();
-	void set_leave_color();
-
   private:
 	ARDOUR::TempoSection& _tempo;
 };
@@ -161,9 +158,6 @@ class MeterMarker : public ArdourMarker
 
 	ARDOUR::MeterSection& meter() const { return _meter; }
 
-	void set_enter_color();
-	void set_leave_color();
-
   private:
 	ARDOUR::MeterSection& _meter;
 };
-- 
cgit v1.2.3