diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-12-21 05:56:07 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-12-21 05:56:07 +1100 |
| commit | 109cd269b4f892c1dda03fdbbdbba3ea6cd42d14 (patch) | |
| tree | 7ef79a4746bb781b730e335e89cce445ce460f04 /libs | |
| parent | deb059ff0d841de01f1de0316b05f71bfedfa0ba (diff) | |
fix yet another meter-locked tempo ordering thinko.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/tempo.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 4e6a853ec5..ab7f459d1e 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -2658,13 +2658,11 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou if (prev_t && !section_prev && ((sml && tlm && t->pulse() > section->pulse()) || (!tlm && t->minute() > minute))) { section_prev = prev_t; - if (t->locked_to_meter()) { - section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute)); - if (!section->locked_to_meter()) { - section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute)); - } - prev_t = section; + section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute)); + if (!section->locked_to_meter()) { + section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute)); } + prev_t = section; } if (t->position_lock_style() == MusicTime) { @@ -2681,13 +2679,6 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou } } - if (section_prev) { - section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute)); - if (!section->locked_to_meter()) { - section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute)); - } - } - #if (0) recompute_tempi (imaginary); |