ardour/livetrax
13
0
Fork 0
Code

fix MidiRegion::merge() to allow final events of a region to be part of the newly merged result

Browse Source
This commit is contained in:
Paul Davis 2022-10-27 17:35:56 -06:00
parent bd33971346
commit efdc47bc74
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/midi_region.cc
View File

@ -564,15 +564,16 @@ MidiRegion::merge (boost::shared_ptr<MidiRegion const> other_region)
for (Evoral::Sequence<Temporal::Beats>::const_iterator e = other->begin(); e != other->end(); ++e) {
std::cerr << "event " << *e << " @ " << e->time().str() << " vs " << other_region_start.str() << " .. " << other_region_end.str() << " other = " << other << std::endl;
if (e->time() < other_region_start) {
continue;
}
/* other_region_end is an exclusive end, not inclusive */
/* other_region_end is an inclusive end, not
* exclusive, since we allow simultaneous MIDI events
* (given appropriate semantic sorting)
*/
if (e->time() >= other_region_end) {
if (e->time() > other_region_end) {
break;
}