From 109cd269b4f892c1dda03fdbbdbba3ea6cd42d14 Mon Sep 17 00:00:00 2001 From: nick_m Date: Wed, 21 Dec 2016 05:56:07 +1100 Subject: [PATCH] fix yet another meter-locked tempo ordering thinko. --- libs/ardour/tempo.cc | 17 ++++------------- 1 file 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);