From 5ade0927ddcbbb1aec6af649c875c81bc0cdf6b4 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 20 Jan 2022 18:55:44 -0700
Subject: [PATCH] remove Other/Any follow action types

---
 libs/ardour/ardour/types.h |  2 --
 libs/ardour/enums.cc       |  2 --
 libs/ardour/triggerbox.cc  | 30 ------------------------------
 3 files changed, 34 deletions(-)

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 343e877c36..2def07db90 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -831,8 +831,6 @@ struct FollowAction {
 		ReverseTrigger, /* any "prev" skipping empties */
 		FirstTrigger,
 		LastTrigger,
-		AnyTrigger,
-		OtherTrigger,
 		JumpTrigger,
 	};
 
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 61f7852e61..bc12c2ad46 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -866,8 +866,6 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (FollowAction, ReverseTrigger);
 	REGISTER_CLASS_ENUM (FollowAction, FirstTrigger);
 	REGISTER_CLASS_ENUM (FollowAction, LastTrigger);
-	REGISTER_CLASS_ENUM (FollowAction, AnyTrigger);
-	REGISTER_CLASS_ENUM (FollowAction, OtherTrigger);
 	REGISTER_CLASS_ENUM (FollowAction, JumpTrigger);
 	REGISTER (_FollowAction);
 
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index 36da5f872f..6fc2926156 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -3117,36 +3117,6 @@ TriggerBox::determine_next_trigger (uint32_t current)
 		}
 		break;
 
-	case FollowAction::AnyTrigger:
-		while (true) {
-			n = _pcg.rand (all_triggers.size());
-			if (!all_triggers[n]->region()) {
-				continue;
-			}
-			if (all_triggers[n]->active()) {
-				continue;
-			}
-			break;
-		}
-		return n;
-
-
-	case FollowAction::OtherTrigger:
-		while (true) {
-			n = _pcg.rand (all_triggers.size());
-			if ((uint32_t) n == current) {
-				continue;
-			}
-			if (!all_triggers[n]->region()) {
-				continue;
-			}
-			if (all_triggers[n]->active()) {
-				continue;
-			}
-			break;
-		}
-		return n;
-
 	case FollowAction::JumpTrigger:
 		for (std::size_t n = 0; n < default_triggers_per_box; ++n) {
 			if (fa.targets.test (n) && all_triggers[n]->region()) {