ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

temporal: fix bug in TempoMap::get_grid() when next point (eg. BBT) is not on grid

This commit is contained in:
Paul Davis 2022-05-27 18:46:06 -06:00
parent 69ee83e6ce
commit 03649dc32a
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/temporal/tempo.cc
View File

@ -1948,27 +1948,23 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
if (bar_mod != 0) {
if (p->bbt().is_bar() && (bar_mod == 1 || ((p->bbt().bars % bar_mod == 0)))) {
ret.push_back (TempoMapPoint (*this, metric, p->sclock(), p->beats(), p->bbt()));
/* reset our notion of where we are */
start = p->sclock();
bbt = p->bbt();
beats = p->beats();
DEBUG_TRACE (DEBUG::Grid, string_compose ("G %1\t %2\n", metric, ret.back()));
} else {
DEBUG_TRACE (DEBUG::Grid, string_compose ("-- skip %1 not on bar_mod %2\n", bbt, bar_mod));
DEBUG_TRACE (DEBUG::Grid, string_compose ("-- skip %1 not on bar_mod %2\n", p->bbt(), bar_mod));
}
} else {
start = p->sclock();
bbt = p->bbt();
beats = p->beats();
ret.push_back (TempoMapPoint (*this, metric, start, beats, bbt));
ret.push_back (TempoMapPoint (*this, metric, p->sclock(), p->beats(), p->bbt()));
DEBUG_TRACE (DEBUG::Grid, string_compose ("G %1\t %2\n", metric, ret.back()));
}
/* reset our notion of where we are */
start = p->sclock();
bbt = p->bbt();
beats = p->beats();
/* But there may be multiple points here, and we have
* to check them all (Tempo/Meter/MusicTime ... which
* is itself both a Tempo *and* Meter point) before