smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

Implement replacing events in the immediate queue

Browse source 
This corrects issues introduced in a75c239c0c,
and fixes MIDI playback.
This commit is contained in:
Robin Gareus 2021-03-24 04:05:35 +01:00
parent 3f50b6d639
commit bbb244c1c9
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libs/ardour/session_events.cc
View file

@ -250,15 +250,18 @@ SessionEventManager::_replace_event (SessionEvent* ev)
bool ret = false; bool ret = false;
Events::iterator i; Events::iterator i;
/* private, used only for events that can only exist once in the queue */ /* use only for events that can only exist once in the respective queue */
Events& e (ev->action_sample == SessionEvent::Immediate ? immediate_events : events);
for (i = events.begin(); i != events.end(); ++i) { for (i = e.begin(); i != e.end(); ++i) {
if ((*i)->type == ev->type && ev->type == SessionEvent::Overwrite && (*i)->track.lock() == ev->track.lock()) { if ((*i)->type == ev->type && ev->type == SessionEvent::Overwrite && (*i)->track.lock() == ev->track.lock() && (*i)->overwrite == ev->overwrite) {
assert (ev->action_sample == SessionEvent::Immediate);
ret = true; ret = true;
delete ev; delete ev;
break; break;
} }
else if ((*i)->type == ev->type && ev->type != SessionEvent::Overwrite) { else if ((*i)->type == ev->type && ev->type != SessionEvent::Overwrite) {
assert (ev->action_sample != SessionEvent::Immediate);
assert (ev->type == SessionEvent::PunchIn || ev->type == SessionEvent::PunchOut || ev->type == SessionEvent::AutoLoop); assert (ev->type == SessionEvent::PunchIn || ev->type == SessionEvent::PunchOut || ev->type == SessionEvent::AutoLoop);
(*i)->action_sample = ev->action_sample; (*i)->action_sample = ev->action_sample;
(*i)->target_sample = ev->target_sample; (*i)->target_sample = ev->target_sample;
@ -270,12 +273,17 @@ SessionEventManager::_replace_event (SessionEvent* ev)
} }
} }
if (i == events.end()) { if (i == e.end()) {
events.insert (events.begin(), ev); e.insert (e.begin(), ev);
} }
events.sort (SessionEvent::compare); if (ev->action_sample == SessionEvent::Immediate) {
next_event = events.end(); /* no need to sort immediate events */
return ret;
}
e.sort (SessionEvent::compare);
next_event = e.end();
set_next_event (); set_next_event ();
return ret; return ret;