diff options
author | nick_m <mainsbridge@gmail.com> | 2016-05-24 06:28:06 +1000 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
commit | 5d5fba0cfbec28eec710aabba6f55f1dcdb75d5a (patch) | |
tree | 1bda6723a94a4e8bf2f6a5843526bcd897263836 /libs | |
parent | cfe1c85f4f467f6b2fb9a7dbc4f30b25f7bb5614 (diff) |
Tempo ramps - rename no-op
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/tempo.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 9fa77a71a9..e823f8f26c 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1273,24 +1273,24 @@ TempoMap::recompute_meters (Metrics& metrics) } else { /* MusicTime */ double pulse = 0.0; - pair<double, BBT_Time> new_beat; + pair<double, BBT_Time> b_bbt; if (prev_m) { const double beats = (meter->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar(); if (beats + prev_m->beat() != meter->beat()) { /* reordering caused a bbt change */ - new_beat = make_pair (beats + prev_m->beat() + b_bbt = make_pair (beats + prev_m->beat() , BBT_Time ((beats / prev_m->divisions_per_bar()) + prev_m->bbt().bars, 1, 0)); } else { - new_beat = make_pair (beats + prev_m->beat(), meter->bbt()); + b_bbt = make_pair (beats + prev_m->beat(), meter->bbt()); } pulse = (beats / prev_m->note_divisor()) + prev_m->pulse(); } else { /* shouldn't happen - the first is audio-locked */ pulse = pulse_at_beat_locked (metrics, meter->beat()); - new_beat = make_pair (meter->beat(), meter->bbt()); + b_bbt = make_pair (meter->beat(), meter->bbt()); } - meter->set_beat (new_beat); + meter->set_beat (b_bbt); meter->set_pulse (pulse); meter->set_frame (frame_at_pulse_locked (metrics, pulse)); } |