From ce54a23a361cbc25f16e65e1529e975bb374de99 Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 7 Jan 2017 02:29:14 +1100 Subject: [PATCH] clear up _initial vs _locked_to_meter TempoSection ambiguity. --- libs/ardour/tempo.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index bab4abd67f..4de4dcfa1f 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1462,7 +1462,7 @@ TempoMap::recompute_meters (Metrics& metrics) TempoSection* t; if ((*ii)->is_tempo()) { t = static_cast (*ii); - if ((t->locked_to_meter() || t->initial()) && t->frame() == meter->frame()) { + if (t->locked_to_meter() && t->frame() == meter->frame()) { meter_locked_tempo = t; break; } @@ -2824,7 +2824,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou TempoSection* t; if ((*ii)->is_tempo()) { t = static_cast (*ii); - if ((t->locked_to_meter() || t->initial()) && t->frame() == section->frame()) { + if (t->locked_to_meter() && t->frame() == section->frame()) { meter_locked_tempo = t; break; } @@ -3000,7 +3000,7 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti TempoSection* t; if ((*ii)->is_tempo()) { t = static_cast (*ii); - if ((t->locked_to_meter() || t->initial()) && t->frame() == m->frame()) { + if (t->locked_to_meter() && t->frame() == m->frame()) { meter_locked_tempo = t; break; }