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

avoid duplicate BBT points in grid

Browse Source
This commit is contained in:
Paul Davis 2022-11-22 18:09:07 -07:00
parent 1cf6886775
commit d0fb7ae18a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/temporal/tempo.cc
View File

@ -2146,14 +2146,20 @@ TempoMap::get_grid (TempoMapPoints& ret, superclock_t start, superclock_t end, u
do {
const Temporal::Beats beats = metric.quarters_at_superclock (start);
if (bar_mod != 0) {
if (bbt.is_bar() && (bar_mod == 1 || ((bbt.bars % bar_mod == 0)))) {
/* It is possible we already added the current BBT
* point, so check to avoid doubling up
*/
if (ret.back().bbt() != bbt) {
if (bar_mod != 0) {
if (bbt.is_bar() && (bar_mod == 1 || ((bbt.bars % bar_mod == 0)))) {
ret.push_back (TempoMapPoint (*this, metric, start, beats, bbt));
DEBUG_TRACE (DEBUG::Grid, string_compose ("Gend %1\t %2\n", metric, ret.back()));
}
} else {
ret.push_back (TempoMapPoint (*this, metric, start, beats, bbt));
DEBUG_TRACE (DEBUG::Grid, string_compose ("Gend %1\t %2\n", metric, ret.back()));
}
} else {
ret.push_back (TempoMapPoint (*this, metric, start, beats, bbt));
DEBUG_TRACE (DEBUG::Grid, string_compose ("Gend %1\t %2\n", metric, ret.back()));
}
start += step;