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

temporal: fix incorrect implementation of TempoMap::tempo_map()

Browse Source 
std::lower_bound() is not appropriate here. We need to find the first
TempoPoint after the given time, then return the one before that.
This commit is contained in:
Paul Davis 2021-11-12 14:19:38 -07:00
parent e7e44351cc
commit 5b5ca546e0
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libs/temporal/tempo.cc
View File

@ -2795,9 +2795,19 @@ TempoMap::tempo_at (superclock_t sc) const
{
assert (!_tempos.empty());
Point::sclock_comparator cmp;
Tempos::const_iterator t = std::lower_bound (_tempos.begin(), _tempos.end(), sc, cmp);
assert (t != _tempos.end());
return *t;
Tempos::const_iterator prev = _tempos.end();
for (Tempos::const_iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
if (cmp (*t, sc)) {
prev = t;
} else {
break;
}
}
if (prev == _tempos.end()) {
return _tempos.front();
}
return *prev;
}
@ -2806,8 +2816,25 @@ TempoMap::tempo_at (Beats const & b) const
{
assert (!_tempos.empty());
Point::beat_comparator cmp;
Tempos::const_iterator prev = _tempos.end();
for (Tempos::const_iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
if (cmp (*t, b)) {
prev = t;
} else {
break;
}
}
if (prev == _tempos.end()) {
return _tempos.front();
}
return *prev;
Tempos::const_iterator t = std::lower_bound (_tempos.begin(), _tempos.end(), b, cmp);
assert (t != _tempos.end());
if (t == _tempos.end()) {
return _tempos.front();
}
return *t;
}
@ -2816,9 +2843,19 @@ TempoMap::tempo_at (BBT_Time const & bbt) const
{
assert (!_tempos.empty());
Point::bbt_comparator cmp;
Tempos::const_iterator t = std::lower_bound (_tempos.begin(), _tempos.end(), bbt, cmp);
assert (t != _tempos.end());
return *t;
Tempos::const_iterator prev = _tempos.end();
for (Tempos::const_iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
if (cmp (*t, bbt)) {
prev = t;
} else {
break;
}
}
if (prev == _tempos.end()) {
return _tempos.front();
}
return *prev;
}
TempoMetric