ardour/livetrax
13
0
Fork 0
Code

remove FollowAction type "QueuedTrigger"

Browse Source
This commit is contained in:
Paul Davis 2022-01-20 17:16:33 -07:00
parent dd159b0841
commit bbdfc5e777
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/types.h
View File

@ -827,7 +827,6 @@ struct FollowAction {
None,
Stop,
Again,
QueuedTrigger, /* DP-style */
NextTrigger, /* Live-style, and below */
PrevTrigger,
ForwardTrigger, /* any "next" skipping empties */

1
libs/ardour/enums.cc
View File

@ -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);

21
libs/ardour/triggerbox.cc
View File

@ -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;
}