ardour/livetrax
13
0
Fork 0
Code

do not queue multiple Locate or LocateRoll events

Browse Source
This commit is contained in:
Paul Davis 2017-07-17 14:04:45 -04:00
parent 3d183dc462
commit 144f95c305
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/session_events.cc
View File

@ -211,6 +211,11 @@ SessionEventManager::merge_event (SessionEvent* ev)
/* try to handle immediate events right here */
if (ev->type == SessionEvent::Locate || ev->type == SessionEvent::LocateRoll) {
/* remove any existing Locates that are waiting to execute */
_clear_event_type (ev->type);
}
if (ev->action_frame == SessionEvent::Immediate) {
process_event (ev);
return;
@ -222,7 +227,6 @@ SessionEventManager::merge_event (SessionEvent* ev)
case SessionEvent::StopOnce:
_clear_event_type (ev->type);
break;
default:
for (Events::iterator i = events.begin(); i != events.end(); ++i) {
if ((*i)->type == ev->type && (*i)->action_frame == ev->action_frame) {
@ -336,4 +340,3 @@ SessionEventManager::_clear_event_type (SessionEvent::Type type)
set_next_event ();
}