diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-07 02:29:14 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-01-07 02:29:14 +1100 |
| commit | ce54a23a361cbc25f16e65e1529e975bb374de99 (patch) | |
| tree | 65ee6e8ded1c205902ffba9c2b4771f452bdb3ae /libs/ardour/tempo.cc | |
| parent | 28058f630294f70830b08deff71d8287123c744d (diff) | |
clear up _initial vs _locked_to_meter TempoSection ambiguity.
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 6 |
1 files 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<TempoSection*> (*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<TempoSection*> (*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<TempoSection*> (*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; } |