ardour/livetrax
13
0
Fork 0
Code

temporal: use new debug bit for debug output in reset_starting_at()

Browse Source
This commit is contained in:
Paul Davis 2022-05-13 18:11:50 -06:00
parent 5d22e522d1
commit 43b3ec005f
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/temporal/tempo.cc
View File

@ -1120,9 +1120,12 @@ TempoMap::remove_point (Point const & point)
void void
TempoMap::reset_starting_at (superclock_t sc) TempoMap::reset_starting_at (superclock_t sc)
{ {
DEBUG_TRACE (DEBUG::TemporalMap, string_compose ("reset starting at %1\n", sc)); DEBUG_TRACE (DEBUG::MapReset, string_compose ("reset starting at %1\n", sc));
// cerr << "RESET starting at " << sc << endl; #ifndef NDEBUG
// dump (cerr); if (DEBUG_ENABLED(DEBUG::MapReset)) {
dump (std::cerr);
}
#endif
assert (!_tempos.empty()); assert (!_tempos.empty());
assert (!_meters.empty()); assert (!_meters.empty());
@ -1135,11 +1138,12 @@ TempoMap::reset_starting_at (superclock_t sc)
TempoMetric metric (_tempos.front(), _meters.front()); TempoMetric metric (_tempos.front(), _meters.front());
Points::iterator p; Points::iterator p;
// cerr << "We begin at " << sc << " with metric = " << metric << endl; DEBUG_TRACE (DEBUG::MapReset, string_compose ("we begin at %1 with metric %2\n", sc, metric));
for (p = _points.begin(); p != _points.end(); ++p) { for (p = _points.begin(); p != _points.end(); ++p) {
// cerr << "Now looking at " << *p << endl; DEBUG_TRACE (DEBUG::MapReset, string_compose ("Now looking at %1\n", *p));
if (p->sclock() >= sc) { if (p->sclock() >= sc) {
break; break;
@ -1158,14 +1162,13 @@ TempoMap::reset_starting_at (superclock_t sc)
*/ */
metric = TempoMetric (*mtp, *mtp); metric = TempoMetric (*mtp, *mtp);
// cerr << "Bartime! " << metric << endl; DEBUG_TRACE (DEBUG::MapReset, "Bartime!\n");
} else if ((tp = dynamic_cast<TempoPoint*> (&*p)) != 0) { } else if ((tp = dynamic_cast<TempoPoint*> (&*p)) != 0) {
metric = TempoMetric (*tp, metric.meter()); metric = TempoMetric (*tp, metric.meter());
// cerr << "Tempo! " << metric << endl; DEBUG_TRACE (DEBUG::MapReset, "Tempo!\n");
} else if ((mp = dynamic_cast<MeterPoint*> (&*p)) != 0) { } else if ((mp = dynamic_cast<MeterPoint*> (&*p)) != 0) {
metric = TempoMetric (metric.tempo(), *mp); metric = TempoMetric (metric.tempo(), *mp);
// cerr << "Meter! " << metric << endl; DEBUG_TRACE (DEBUG::MapReset, "Meter!\n");
} }
} }
@ -1182,7 +1185,7 @@ TempoMap::reset_starting_at (superclock_t sc)
} }
} }
// cerr << "====> working on it!\n"; DEBUG_TRACE (DEBUG::MapReset, string_compose ("workong on it! tp = %1\n", tp));
if (tp) { if (tp) {
@ -1205,12 +1208,12 @@ TempoMap::reset_starting_at (superclock_t sc)
} }
if (!mtp) { if (!mtp) {
// cerr << "recompute " << p->bbt() << " using " << metric << endl; DEBUG_TRACE (DEBUG::MapReset, string_compose ("recompute %1 using %2\n", p->bbt(), metric));
superclock_t sc = metric.superclock_at (p->bbt()); superclock_t sc = metric.superclock_at (p->bbt());
DEBUG_TRACE (DEBUG::TemporalMap, string_compose ("\tbased on %1 move to %2,%3\n", p->bbt(), sc, p->beats())); DEBUG_TRACE (DEBUG::MapReset, string_compose ("\tbased on %1 move to %2,%3\n", p->bbt(), sc, p->beats()));
p->set (sc, p->beats(), p->bbt()); p->set (sc, p->beats(), p->bbt());
} else { } else {
// cerr << "not resetting this\n"; DEBUG_TRACE (DEBUG::MapReset, "\tnot recomputing this one\n");
} }
/* Now ensure that metric is correct moving forward */ /* Now ensure that metric is correct moving forward */
@ -1224,8 +1227,12 @@ TempoMap::reset_starting_at (superclock_t sc)
} }
} }
// cerr << "RESET DONE\n\n\n"; DEBUG_TRACE (DEBUG::MapReset, "RESET DONE\n");
// dump (cerr); #ifndef NDEBUG
if (DEBUG_ENABLED(DEBUG::MapReset)) {
dump (std::cerr);
}
#endif
} }
bool bool