ardour/livetrax
13
0
Fork 0
Code

Tempo ramps - rename no-op

Browse Source
This commit is contained in:
nick_m 2016-05-24 06:28:06 +10:00
parent cfe1c85f4f
commit 5d5fba0cfb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/tempo.cc
View File

@ -1273,24 +1273,24 @@ TempoMap::recompute_meters (Metrics& metrics)
} else { } else {
/* MusicTime */ /* MusicTime */
double pulse = 0.0; double pulse = 0.0;
pair<double, BBT_Time> new_beat; pair<double, BBT_Time> b_bbt;
if (prev_m) { if (prev_m) {
const double beats = (meter->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar(); const double beats = (meter->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar();
if (beats + prev_m->beat() != meter->beat()) { if (beats + prev_m->beat() != meter->beat()) {
/* reordering caused a bbt change */ /* 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)); , BBT_Time ((beats / prev_m->divisions_per_bar()) + prev_m->bbt().bars, 1, 0));
} else { } 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(); pulse = (beats / prev_m->note_divisor()) + prev_m->pulse();
} else { } else {
/* shouldn't happen - the first is audio-locked */ /* shouldn't happen - the first is audio-locked */
pulse = pulse_at_beat_locked (metrics, meter->beat()); 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_pulse (pulse);
meter->set_frame (frame_at_pulse_locked (metrics, pulse)); meter->set_frame (frame_at_pulse_locked (metrics, pulse));
} }