From 0d0e458dde932965c4e283b0204b6d3011a3c90f Mon Sep 17 00:00:00 2001 From: nick_m Date: Sun, 20 Dec 2015 06:41:20 +1100 Subject: tempo ramps - fix dumb iterator error. thanks robin. --- libs/ardour/tempo.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index e56337c3a9..821e6ddf37 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1029,12 +1029,14 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, uint32_t first_tick_in_new_meter = 0; Metrics::const_iterator i; + Metrics::const_iterator mi; + TempoSection* prev_ts = tempo; - for (i = metrics.begin(); i != metrics.end(); ++i) { + for (mi = metrics.begin(); mi != metrics.end(); ++mi) { MeterSection* m = 0; - if ((m = dynamic_cast (*i)) != 0) { + if ((m = dynamic_cast (*mi)) != 0) { if (m->start() >= prev_ts->start()) { first_tick_in_new_meter = ((((m->start().bars - 1) * meter->divisions_per_bar()) + (m->start().beats - 1)) * BBT_Time::ticks_per_beat) + m->start().ticks; // expressed in ticks from the previous meter -- cgit v1.2.3