From 0f8189928058ee6593b5b4e52e1a0c0a8ee4ce39 Mon Sep 17 00:00:00 2001 From: nick_m Date: Mon, 29 Feb 2016 05:42:22 +1100 Subject: [PATCH] Tempo ramps - fixes bbt wrt frame-locked tempo sections in the tempo dialog --- libs/ardour/tempo.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 749042d950..da22da4bd2 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -839,13 +839,18 @@ TempoMap::replace_c_func_from_tempo_and_beat (const double& bpm, const double& b for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((t = dynamic_cast (*i)) != 0) { - if (prev_ts && beat < t->beat()) { + if (prev_ts) { prev_ts->set_c_func_from_tempo_and_beat (bpm, beat, _frame_rate); - break; + + if (beat < t->beat()) { + return; + } } prev_ts = t; } } + /* there is always at least one tempo section */ + prev_ts->set_c_func_from_tempo_and_beat (bpm, beat, _frame_rate); } void