correct (?) behaviour of TempoMap::replace_tempo
authornick_m <mainsbridge@gmail.com>
Fri, 24 Feb 2017 19:59:05 +0000 (06:59 +1100)
committerRobin Gareus <robin@gareus.org>
Mon, 27 Feb 2017 19:16:10 +0000 (20:16 +0100)
libs/ardour/tempo.cc

index 6c0032a67345c9e207d19b78865e5ccd92639cd7..b1fec3c1ee37474c3bf4b3d071d05104736c9623 100644 (file)
@@ -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;
                                                }
                                        }
                                }