remove FollowAction type "QueuedTrigger"
This commit is contained in:
parent
dd159b0841
commit
bbdfc5e777
@ -827,7 +827,6 @@ struct FollowAction {
|
|||||||
None,
|
None,
|
||||||
Stop,
|
Stop,
|
||||||
Again,
|
Again,
|
||||||
QueuedTrigger, /* DP-style */
|
|
||||||
NextTrigger, /* Live-style, and below */
|
NextTrigger, /* Live-style, and below */
|
||||||
PrevTrigger,
|
PrevTrigger,
|
||||||
ForwardTrigger, /* any "next" skipping empties */
|
ForwardTrigger, /* any "next" skipping empties */
|
||||||
|
@ -862,7 +862,6 @@ setup_enum_writer ()
|
|||||||
REGISTER_CLASS_ENUM (FollowAction, None);
|
REGISTER_CLASS_ENUM (FollowAction, None);
|
||||||
REGISTER_CLASS_ENUM (FollowAction, Stop);
|
REGISTER_CLASS_ENUM (FollowAction, Stop);
|
||||||
REGISTER_CLASS_ENUM (FollowAction, Again);
|
REGISTER_CLASS_ENUM (FollowAction, Again);
|
||||||
REGISTER_CLASS_ENUM (FollowAction, QueuedTrigger);
|
|
||||||
REGISTER_CLASS_ENUM (FollowAction, NextTrigger);
|
REGISTER_CLASS_ENUM (FollowAction, NextTrigger);
|
||||||
REGISTER_CLASS_ENUM (FollowAction, PrevTrigger);
|
REGISTER_CLASS_ENUM (FollowAction, PrevTrigger);
|
||||||
REGISTER_CLASS_ENUM (FollowAction, ForwardTrigger);
|
REGISTER_CLASS_ENUM (FollowAction, ForwardTrigger);
|
||||||
|
@ -3042,22 +3042,16 @@ 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));
|
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) {
|
if (fa.type == FollowAction::Stop) {
|
||||||
|
|
||||||
case FollowAction::Stop:
|
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
case FollowAction::QueuedTrigger:
|
|
||||||
/* XXX implement me */
|
|
||||||
return -1;
|
|
||||||
default:
|
|
||||||
if (runnable == 1) {
|
if (runnable == 1) {
|
||||||
/* there's only 1 runnable trigger, so the "next" one
|
/* there's only 1 runnable trigger, so the "next" one
|
||||||
is the same as the current one.
|
is the same as the current one.
|
||||||
*/
|
*/
|
||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* second switch: handle the "real" follow actions */
|
/* second switch: handle the "real" follow actions */
|
||||||
|
|
||||||
@ -3186,7 +3180,6 @@ TriggerBox::determine_next_trigger (uint32_t current)
|
|||||||
|
|
||||||
/* NOTREACHED */
|
/* NOTREACHED */
|
||||||
case FollowAction::Stop:
|
case FollowAction::Stop:
|
||||||
case FollowAction::QueuedTrigger:
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user