From 8b1baa2406d904f14200ae58b6fa26fd94bcb2c1 Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 25 Feb 2017 06:59:05 +1100 Subject: [PATCH] correct (?) behaviour of TempoMap::replace_tempo --- libs/ardour/tempo.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 6c0032a673..b1fec3c1ee 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1155,12 +1155,10 @@ TempoMap::replace_tempo (TempoSection& ts, const Tempo& tempo, const double& pul bool const lm = new_ts->locked_to_meter(); if ((ipm && this_t->pulse() > new_ts->pulse()) || (!ipm && this_t->frame() > new_ts->frame()) || (lm && this_t->pulse() > new_ts->pulse())) { - //if (prev_tempo && prev_tempo->type() == TempoSection::Ramp) { - new_ts->set_end_note_types_per_minute (this_t->note_types_per_minute()); - //} + new_ts->set_end_note_types_per_minute (tempo.end_note_types_per_minute()); + break; } - //prev_tempo = this_t; } } }