From e4c56a0371b6b07db967b54b3d219ea38352af9b Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 15 Aug 2020 01:06:15 +0200
Subject: [PATCH] Remove unused API

These are longer be used since Seuqnce has a "force_discrete"
boolen that needs to be taken into account in addition to
user-configurable ControlList _interpolation mode.
---
 libs/evoral/ControlList.cc       | 38 --------------------------------
 libs/evoral/Sequence.cc          |  2 +-
 libs/evoral/evoral/ControlList.h |  2 --
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/libs/evoral/ControlList.cc b/libs/evoral/ControlList.cc
index eb38456194..cde1718e23 100644
--- a/libs/evoral/ControlList.cc
+++ b/libs/evoral/ControlList.cc
@@ -1538,44 +1538,6 @@ ControlList::build_search_cache_if_necessary (double start) const
 	_search_cache.left = start;
 }
 
-/** Get the earliest event after \a start using the current interpolation style.
- *
- * If an event is found, \a x and \a y are set to its coordinates.
- *
- * \param inclusive Include events with timestamp exactly equal to \a start
- * \return true if event is found (and \a x and \a y are valid).
- */
-bool
-ControlList::rt_safe_earliest_event (double start, double& x, double& y, bool inclusive) const
-{
-	// FIXME: It would be nice if this was unnecessary..
-	Glib::Threads::RWLock::ReaderLock lm(_lock, Glib::Threads::TRY_LOCK);
-	if (!lm.locked()) {
-		return false;
-	}
-
-	return rt_safe_earliest_event_unlocked (start, x, y, inclusive);
-}
-
-
-/** Get the earliest event after \a start using the current interpolation style.
- *
- * If an event is found, \a x and \a y are set to its coordinates.
- *
- * \param inclusive Include events with timestamp exactly equal to \a start
- * \return true if event is found (and \a x and \a y are valid).
- */
-bool
-ControlList::rt_safe_earliest_event_unlocked (double start, double& x, double& y, bool inclusive) const
-{
-	if (_interpolation == Discrete) {
-		return rt_safe_earliest_event_discrete_unlocked(start, x, y, inclusive);
-	} else {
-		return rt_safe_earliest_event_linear_unlocked(start, x, y, inclusive);
-	}
-}
-
-
 /** Get the earliest event after \a start without interpolation.
  *
  * If an event is found, \a x and \a y are set to its coordinates.
diff --git a/libs/evoral/Sequence.cc b/libs/evoral/Sequence.cc
index d9e9caa7bf..0f501732d0 100644
--- a/libs/evoral/Sequence.cc
+++ b/libs/evoral/Sequence.cc
@@ -152,7 +152,7 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>&
 		if (_force_discrete || i->second->list()->interpolation() == ControlList::Discrete) {
 			ret = i->second->list()->rt_safe_earliest_event_discrete_unlocked (t.to_double(), x, y, true);
 		} else {
-			ret = i->second->list()->rt_safe_earliest_event_unlocked(t.to_double(), x, y, true);
+			ret = i->second->list()->rt_safe_earliest_event_linear_unlocked(t.to_double(), x, y, true);
 		}
 		if (!ret) {
 			DEBUG_TRACE (DEBUG::Sequence, string_compose ("Iterator: CC %1 (size %2) has no events past %3\n",
diff --git a/libs/evoral/evoral/ControlList.h b/libs/evoral/evoral/ControlList.h
index 984e856e48..1c9c2192d0 100644
--- a/libs/evoral/evoral/ControlList.h
+++ b/libs/evoral/evoral/ControlList.h
@@ -298,8 +298,6 @@ public:
 	 */
 	double unlocked_eval (double x) const;
 
-	bool rt_safe_earliest_event (double start, double& x, double& y, bool start_inclusive=false) const;
-	bool rt_safe_earliest_event_unlocked (double start, double& x, double& y, bool start_inclusive=false) const;
 	bool rt_safe_earliest_event_linear_unlocked (double start, double& x, double& y, bool inclusive) const;
 	bool rt_safe_earliest_event_discrete_unlocked (double start, double& x, double& y, bool inclusive) const;