ardour/livetrax
13
0
Fork 0
Code

midi combine: new region is same extent as the combined regions

Browse Source
This commit is contained in:
Paul Davis 2022-08-20 14:29:13 -06:00
parent ef34daedeb
commit ac27bbafcf
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/ardour/midi_playlist.cc
View File

@ -392,11 +392,18 @@ MidiPlaylist::combine (RegionList const & rl)
RegionList::const_iterator i = sorted.begin();
++i;
#ifndef NDEBUG
timepos_t earliest (timepos_t::max (Temporal::BeatTime));
timepos_t latest (timepos_t (Temporal::BeatTime));
for (auto const & r : rl) {
assert (boost::dynamic_pointer_cast<MidiRegion> (r));
if (r->position() < earliest) {
earliest = r->position();
}
if (r->end() > latest) {
latest = r->end();
}
}
#endif
boost::shared_ptr<MidiRegion> new_region = boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (first, true, true, &rwl.thawlist));
@ -410,17 +417,7 @@ MidiPlaylist::combine (RegionList const & rl)
++i;
}
Temporal::BBT_Time bbt_at_end = Temporal::TempoMap::use()->bbt_at (new_region->end());
/* round up to next bar */
if (bbt_at_end.beats > 1 || bbt_at_end.ticks > 0) {
bbt_at_end.beats = 1;
bbt_at_end.ticks = 0;
bbt_at_end.bars++;
}
new_region->set_length (new_region->position().distance (timepos_t (Temporal::TempoMap::use()->quarters_at (bbt_at_end))));
new_region->set_length (earliest.distance (latest));
add_region_internal (new_region, pos, rwl.thawlist);