diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-12-12 01:57:41 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-12-12 02:07:00 +1100 |
| commit | 4d625d35b6109bf01ae2404b53d6ed156fb37b01 (patch) | |
| tree | 93fcd8aa84c83f95de7eccb00103860f8b83086b /libs/ardour/tempo.cc | |
| parent | 782b28a1a8b32aa8018fb8a9f8355d427b7be0a2 (diff) | |
clean up some odd logic.
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 01f17cf5d0..a074a8a672 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -2511,14 +2511,15 @@ TempoMap::set_active_tempos (const Metrics& metrics, const framepos_t& frame) if (t->initial()) { t->set_active (true); continue; - } - if (!t->initial() && t->active () && t->position_lock_style() == AudioTime && t->frame() < frame) { - t->set_active (false); - t->set_pulse (0.0); - } else if (!t->initial() && t->position_lock_style() == AudioTime && t->frame() > frame) { - t->set_active (true); - } else if (!t->initial() && t->position_lock_style() == AudioTime && t->frame() == frame) { - return false; + } else if (t->position_lock_style() == AudioTime) { + if (t->active () && t->frame() < frame) { + t->set_active (false); + t->set_pulse (0.0); + } else if (t->frame() > frame) { + t->set_active (true); + } else if (t->frame() == frame) { + return false; + } } } } |