allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

temporal: fix incorrect logic in TempoMap::fill_grid_by_walking()

Browse Source 
If walking the grid by bar, but points are closer than that, we could end up
with the wrong TempoMetric being used to compute various time domain
conversions (which tends to leads to abort()).

This small change makes sure that we keep looking for more points if we have
not yet reached the next grid point (e.g. bar).
This commit is contained in:
Paul Davis
2026-01-09 10:51:07 -07:00
parent 943623f027
commit 6bc2261575
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/temporal/tempo.cc
View File

@@ -3140,6 +3140,8 @@ TempoMap::fill_grid_by_walking (TempoMapPoints& ret, Points::const_iterator& p_i
DEBUG_TRACE (DEBUG::Grid, string_compose ("pre-check overrun of next point with bbt @ %1 audio %2 point %3\n", bbt, start, *p));
find_next_point:
bool reset = false;
if (!mtp) {
@@ -3300,6 +3302,16 @@ TempoMap::fill_grid_by_walking (TempoMapPoints& ret, Points::const_iterator& p_i
}
if (p != _points.end() && p->bbt() < bbt) {
/* We reached a point that didn't coincide with the one
we were looking at, but we have not yet reached the BBT
value for the next grid point. Go back and run the
"find next point" loop again.
*/
mtp = dynamic_cast<MusicTimePoint const *> (&*p);
goto find_next_point;
}
DEBUG_TRACE (DEBUG::Grid, string_compose ("reset done, bbt now at %1 with metric %2, get superclock\n", bbt, metric));
start = metric.superclock_at (bbt);