ardour/livetrax
13
0
Fork 0
Code

temporal: various tweaks to get TempoMap::get_grid() to be more correct/robust

Browse Source
This commit is contained in:
Paul Davis 2023-05-05 18:56:01 -06:00
parent 7c07a9964a
commit 9e8eed8a03
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/temporal/tempo.cc
View File

@ -2221,6 +2221,8 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
/* determine the BBT at start */ /* determine the BBT at start */
#warning paul need to double check bbt reference time when changing bbt
bbt = metric.bbt_at (timepos_t::from_superclock (start)); bbt = metric.bbt_at (timepos_t::from_superclock (start));
/* first task: get to the right starting point for the requested /* first task: get to the right starting point for the requested
@ -2294,7 +2296,7 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
if (bar != bbt) { if (bar != bbt) {
bbt = BBT_Argument (bbt.reference(), bar); bbt = BBT_Argument (metric.reftime(), bar);
/* rebuild metric */ /* rebuild metric */
@ -2400,7 +2402,7 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
metric = TempoMetric (*tp, *mp); metric = TempoMetric (*tp, *mp);
DEBUG_TRACE (DEBUG::Grid, string_compose ("reset metric from music-time point %1, now %2\n", *mtp, metric)); DEBUG_TRACE (DEBUG::Grid, string_compose ("reset metric from music-time point %1, now %2\n", *mtp, metric));
bbt = BBT_Argument (timepos_t::from_superclock (p->sclock()), p->bbt()); bbt = BBT_Argument (metric.reftime(), p->bbt());
DEBUG_TRACE (DEBUG::Grid, string_compose ("reset start using bbt %1 as %2\n", p->bbt(), bbt)); DEBUG_TRACE (DEBUG::Grid, string_compose ("reset start using bbt %1 as %2\n", p->bbt(), bbt));
start = p->sclock(); start = p->sclock();
DEBUG_TRACE (DEBUG::Grid, string_compose ("reset start to %1\n", start)); DEBUG_TRACE (DEBUG::Grid, string_compose ("reset start to %1\n", start));
@ -2417,6 +2419,8 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
if (p != _points.end()) { if (p != _points.end()) {
DEBUG_TRACE (DEBUG::Grid, string_compose ("\tstarting point is %1\n", *p)); DEBUG_TRACE (DEBUG::Grid, string_compose ("\tstarting point is %1\n", *p));
} else {
DEBUG_TRACE (DEBUG::Grid, "\treached end already\n");
} }
/* Find all points at this BBT time (the next /* Find all points at this BBT time (the next
@ -2424,7 +2428,9 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
* we find, so that we will use that going forward. * we find, so that we will use that going forward.
*/ */
while (p != _points.end() && p->bbt() == bbt) { superclock_t sc = p->sclock();
while (p != _points.end() && p->bbt() <= bbt && p->sclock() == sc) {
TempoPoint const * tpp; TempoPoint const * tpp;
MeterPoint const * mpp; MeterPoint const * mpp;
@ -2442,7 +2448,7 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
++p; ++p;
if (p != _points.end()) { if (p != _points.end()) {
DEBUG_TRACE (DEBUG::Grid, string_compose ("\next point is %1\n", *p)); DEBUG_TRACE (DEBUG::Grid, string_compose ("next point is %1\n", *p));
} else { } else {
DEBUG_TRACE (DEBUG::Grid, "\tthat was that\n"); DEBUG_TRACE (DEBUG::Grid, "\tthat was that\n");
} }
@ -2455,6 +2461,8 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
metric = TempoMetric (*tp, *mp); metric = TempoMetric (*tp, *mp);
bbt = BBT_Argument (metric.reftime(), bbt); bbt = BBT_Argument (metric.reftime(), bbt);
DEBUG_TRACE (DEBUG::Grid, string_compose ("second| with start = %1 aka %2 rebuilt metric from points, now %3\n", start, bbt, metric)); DEBUG_TRACE (DEBUG::Grid, string_compose ("second| with start = %1 aka %2 rebuilt metric from points, now %3\n", start, bbt, metric));
} else {
DEBUG_TRACE (DEBUG::Grid, string_compose ("not rebuilding metric, continuing with %1\n", metric));
} }
} }