ardour/livetrax
13
0
Fork 0
Code

temporal: fix logic errors in setting up TempoMetric objects

Browse Source 
will likely revisit this to avoid code-duplication and "optimize" traversal of _points list
This commit is contained in:
Paul Davis 2021-03-25 11:29:45 -06:00
parent 011b5ec61c
commit c5ecd14622
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libs/temporal/tempo.cc
View File

@ -1665,20 +1665,26 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
* grid, depending on whether or not it is a multiple of bar_mod. * grid, depending on whether or not it is a multiple of bar_mod.
*/ */
for (tp = &_tempos.front(), mp = &_meters.front(), p = _points.begin(); p != _points.end() && p->sclock() < start; ++p) { for (tp = &_tempos.front(), p = _points.begin(); p != _points.end() && p->sclock() < start; ++p) {
TempoPoint* tpp; TempoPoint* tpp;
MeterPoint* mpp;
DEBUG_TRACE (DEBUG::Grid, string_compose ("Looking at a point %1\n", *p)); DEBUG_TRACE (DEBUG::Grid, string_compose ("Looking at a point tempo %1\n", *p));
if ((tpp = dynamic_cast<TempoPoint*> (&(*p))) != 0) { if ((tpp = dynamic_cast<TempoPoint*> (&(*p))) != 0) {
DEBUG_TRACE (DEBUG::Grid, "set tempo with that\n"); DEBUG_TRACE (DEBUG::Grid, string_compose ("set tempo with that (check: %1 < %2)\n", p->sclock(), start));
tp = tpp; tp = tpp;
} }
}
for (mp = &_meters.front(), p = _points.begin(); p != _points.end() && p->sclock() < start; ++p) {
MeterPoint* mpp;
DEBUG_TRACE (DEBUG::Grid, string_compose ("Looking at a point for meter %1\n", *p));
if ((mpp = dynamic_cast<MeterPoint*> (&(*p))) != 0) { if ((mpp = dynamic_cast<MeterPoint*> (&(*p))) != 0) {
DEBUG_TRACE (DEBUG::Grid, "set meter with that\n"); DEBUG_TRACE (DEBUG::Grid, string_compose ("set meter with that (check: %1 < %2)\n", p->sclock(), start));
mp = mpp; mp = mpp;
} }
@ -1717,14 +1723,17 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
DEBUG_TRACE (DEBUG::Grid, string_compose ("new bbt for start (rounded up) = %1\n", bbt)); DEBUG_TRACE (DEBUG::Grid, string_compose ("new bbt for start (rounded up) = %1\n", bbt));
for (tp = &_tempos.front(), mp = &_meters.front(), p = _points.begin(); p != _points.end() && p->sclock() < start; ++p) { for (tp = &_tempos.front(), p = _points.begin(); p != _points.end() && p->bbt() < bbt; ++p) {
TempoPoint* tpp; TempoPoint* tpp;
MeterPoint* mpp;
if ((tpp = dynamic_cast<TempoPoint*> (&(*p))) != 0) { if ((tpp = dynamic_cast<TempoPoint*> (&(*p))) != 0) {
tp = tpp; tp = tpp;
} }
}
for (mp = &_meters.front(), p = _points.begin(); p != _points.end() && p->bbt() < bbt; ++p) {
MeterPoint* mpp;
if ((mpp = dynamic_cast<MeterPoint*> (&(*p))) != 0) { if ((mpp = dynamic_cast<MeterPoint*> (&(*p))) != 0) {
mp = mpp; mp = mpp;
@ -1735,6 +1744,7 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
/* reset metric */ /* reset metric */
metric = TempoMetric (*tp, *mp); metric = TempoMetric (*tp, *mp);
DEBUG_TRACE (DEBUG::Grid, string_compose ("metric in effect(2) at %1 = %2\n", start, metric));
/* recompute superclock position */ /* recompute superclock position */
@ -1776,7 +1786,7 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
bbt = bar; bbt = bar;
for (tp = &_tempos.front(), mp = &_meters.front(), p = _points.begin(); p != _points.end() && p->sclock() < start; ++p) { for (tp = &_tempos.front(), p = _points.begin(); p != _points.end() && p->bbt() < bbt; ++p) {
TempoPoint* tpp; TempoPoint* tpp;
MeterPoint* mpp; MeterPoint* mpp;
@ -1784,17 +1794,20 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
if ((tpp = dynamic_cast<TempoPoint*> (&(*p))) != 0) { if ((tpp = dynamic_cast<TempoPoint*> (&(*p))) != 0) {
tp = tpp; tp = tpp;
} }
}
for (mp = &_meters.front(), p = _points.begin(); p != _points.end() && p->bbt() < bbt; ++p) {
MeterPoint* mpp;
if ((mpp = dynamic_cast<MeterPoint*> (&(*p))) != 0) { if ((mpp = dynamic_cast<MeterPoint*> (&(*p))) != 0) {
mp = mpp; mp = mpp;
} }
} }
/* reset metric */ /* reset metric */
metric = TempoMetric (*tp, *mp); metric = TempoMetric (*tp, *mp);
DEBUG_TRACE (DEBUG::Grid, string_compose ("metric in effect(3) at %1 = %2\n", start, metric));
start = metric.superclock_at (bbt); start = metric.superclock_at (bbt);
} else { } else {
@ -2765,7 +2778,6 @@ TempoMap::metric_at (superclock_t sc, bool can_match) const
MeterPoint const * mpp = 0; MeterPoint const * mpp = 0;
TempoPoint const * prev_t = &_tempos.front(); TempoPoint const * prev_t = &_tempos.front();
MeterPoint const * prev_m = &_meters.front();
/* Yes, linear search because the typical size of _points /* Yes, linear search because the typical size of _points
* is 2, and extreme sizes are on the order of 10-100 * is 2, and extreme sizes are on the order of 10-100
@ -2777,6 +2789,11 @@ TempoMap::metric_at (superclock_t sc, bool can_match) const
if ((tpp = dynamic_cast<TempoPoint const *> (&(*p)))) { if ((tpp = dynamic_cast<TempoPoint const *> (&(*p)))) {
prev_t = tpp; prev_t = tpp;
} }
}
MeterPoint const * prev_m = &_meters.front();
for (p = _points.begin(); p != _points.end() && p->sclock() < sc; ++p) {
if ((mpp = dynamic_cast<MeterPoint const *> (&(*p)))) { if ((mpp = dynamic_cast<MeterPoint const *> (&(*p)))) {
prev_m = mpp; prev_m = mpp;
} }
@ -2818,7 +2835,6 @@ TempoMap::metric_at (Beats const & b, bool can_match) const
MeterPoint const * mpp = 0; MeterPoint const * mpp = 0;
TempoPoint const * prev_t = &_tempos.front(); TempoPoint const * prev_t = &_tempos.front();
MeterPoint const * prev_m = &_meters.front();
/* Yes, linear search because the typical size of _points /* Yes, linear search because the typical size of _points
* is 2, and extreme sizes are on the order of 10-100 * is 2, and extreme sizes are on the order of 10-100
@ -2830,6 +2846,11 @@ TempoMap::metric_at (Beats const & b, bool can_match) const
if ((tpp = dynamic_cast<TempoPoint const *> (&(*p)))) { if ((tpp = dynamic_cast<TempoPoint const *> (&(*p)))) {
prev_t = tpp; prev_t = tpp;
} }
}
MeterPoint const * prev_m = &_meters.front();
for (p = _points.begin(); p != _points.end() && p->beats() < b; ++p) {
if ((mpp = dynamic_cast<MeterPoint const *> (&(*p)))) { if ((mpp = dynamic_cast<MeterPoint const *> (&(*p)))) {
prev_m = mpp; prev_m = mpp;
} }
@ -2871,7 +2892,6 @@ TempoMap::metric_at (BBT_Time const & bbt, bool can_match) const
MeterPoint const * mpp = 0; MeterPoint const * mpp = 0;
TempoPoint const * prev_t = &_tempos.front(); TempoPoint const * prev_t = &_tempos.front();
MeterPoint const * prev_m = &_meters.front();
/* Yes, linear search because the typical size of _points /* Yes, linear search because the typical size of _points
* is 2, and extreme sizes are on the order of 10-100 * is 2, and extreme sizes are on the order of 10-100
@ -2883,6 +2903,11 @@ TempoMap::metric_at (BBT_Time const & bbt, bool can_match) const
if ((tpp = dynamic_cast<TempoPoint const *> (&(*p)))) { if ((tpp = dynamic_cast<TempoPoint const *> (&(*p)))) {
prev_t = tpp; prev_t = tpp;
} }
}
MeterPoint const * prev_m = &_meters.front();
for (p = _points.begin(); p != _points.end() && p->bbt() < bbt; ++p) {
if ((mpp = dynamic_cast<MeterPoint const *> (&(*p)))) { if ((mpp = dynamic_cast<MeterPoint const *> (&(*p)))) {
prev_m = mpp; prev_m = mpp;
} }