diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-20 06:41:20 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | 0d0e458dde932965c4e283b0204b6d3011a3c90f (patch) | |
| tree | fad6860148ad78c7b8bd23445380206d186e36e5 /libs/ardour | |
| parent | 6cb752dc15f0af31de7e7331a4acb64d075f05d2 (diff) | |
tempo ramps - fix dumb iterator error. thanks robin.
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/tempo.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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<MeterSection*> (*i)) != 0) { + if ((m = dynamic_cast<MeterSection*> (*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 |