From bbdfc5e777ce9e40f3cf5988601dc09bd7dab7ee Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 20 Jan 2022 17:16:33 -0700
Subject: [PATCH] remove FollowAction type "QueuedTrigger"

---
 libs/ardour/ardour/types.h |  1 -
 libs/ardour/enums.cc       |  1 -
 libs/ardour/triggerbox.cc  | 21 +++++++--------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 1a7c913c1c..1428a49968 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -827,7 +827,6 @@ struct FollowAction {
 		None,
 		Stop,
 		Again,
-		QueuedTrigger, /* DP-style */
 		NextTrigger,   /* Live-style, and below */
 		PrevTrigger,
 		ForwardTrigger, /* any "next" skipping empties */
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 315b6e77f9..78effdb757 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -862,7 +862,6 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (FollowAction, None);
 	REGISTER_CLASS_ENUM (FollowAction, Stop);
 	REGISTER_CLASS_ENUM (FollowAction, Again);
-	REGISTER_CLASS_ENUM (FollowAction, QueuedTrigger);
 	REGISTER_CLASS_ENUM (FollowAction, NextTrigger);
 	REGISTER_CLASS_ENUM (FollowAction, PrevTrigger);
 	REGISTER_CLASS_ENUM (FollowAction, ForwardTrigger);
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index f394651f21..d825284617 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -3042,21 +3042,15 @@ TriggerBox::determine_next_trigger (uint32_t current)
 
 	DEBUG_TRACE (DEBUG::Triggers, string_compose ("choose next trigger using follow action %1 given prob %2 and rnd %3\n", fa.to_string(), all_triggers[current]->follow_action_probability(), r));
 
-	switch (fa.type) {
-
-	case FollowAction::Stop:
+	if (fa.type == FollowAction::Stop) {
 		return -1;
+	}
 
-	case FollowAction::QueuedTrigger:
-		/* XXX implement me */
-		return -1;
-	default:
-		if (runnable == 1) {
-			/* there's only 1 runnable trigger, so the "next" one
-			   is the same as the current one.
-			*/
-			return current;
-		}
+	if (runnable == 1) {
+		/* there's only 1 runnable trigger, so the "next" one
+		   is the same as the current one.
+		*/
+		return current;
 	}
 
 	/* second switch: handle the "real" follow actions */
@@ -3186,7 +3180,6 @@ TriggerBox::determine_next_trigger (uint32_t current)
 
 	/* NOTREACHED */
 	case FollowAction::Stop:
-	case FollowAction::QueuedTrigger:
 		break;
 
 	}