ardour/livetrax
13
0
Fork 0
Code

libtemporal: fix grid generation if we pass additional markers before reaching the end

Browse Source
This commit is contained in:
Paul Davis 2021-01-07 16:31:30 -07:00
parent 3017cd0c1f
commit eccfc1db10
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/temporal/tempo.cc
View File

@ -1801,7 +1801,27 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
limit = end;
}
if (start >= limit) {
if (start >= end) {
break;
}
if (start >= limit && nxt_t == _tempos.end() && nxt_m == _meters.end() && nxt_b == _bartimes.end()) {
/* reached the end, no more tempos, meters or bartimes
to consider, so just finish up.
*/
const superclock_t step = metric.superclocks_per_grid_at (start);
while (start < end) {
const Temporal::Beats beats = metric.quarters_at_superclock (start);
ret.push_back (TempoMapPoint (*this, metric, start, beats, bbt));
DEBUG_TRACE (DEBUG::Grid, string_compose ("G %1\t %2\n", metric, ret.back()));
start += step;
bbt = metric.bbt_at (start);
}
/* all done, leave outer loop */
break;
}