allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Tempo ramps - set legacy session's metric pulses correctly.

Browse Source
This commit is contained in:
nick_m
2016-04-05 00:36:33 +10:00
parent 898764c513
commit 75b5030af1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/tempo.cc
View File

@@ -2867,10 +2867,10 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
+ (m->bbt().ticks / BBT_Time::ticks_per_beat)
, m->bbt());
m->set_beat (start);
const double start_pulse = ((m->bbt().bars - 1) * m->note_divisor())
const double start_beat = ((m->bbt().bars - 1) * m->note_divisor())
+ (m->bbt().beats - 1)
+ (m->bbt().ticks / BBT_Time::ticks_per_beat);
m->set_pulse (start_pulse);
m->set_pulse (start_beat / prev_m->note_divisor());
}
prev_m = m;
} else if ((t = dynamic_cast<TempoSection*>(*i)) != 0) {
@@ -2885,8 +2885,13 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
continue;
}
if (prev_t && prev_t->pulse() < 0.0) {
double const start = ((t->legacy_bbt().bars - 1) * prev_m->note_divisor()) + (t->legacy_bbt().beats - 1) + (t->legacy_bbt().ticks / BBT_Time::ticks_per_beat);
t->set_pulse (start);
double const beat = ((t->legacy_bbt().bars - 1) * prev_m->note_divisor()) + (t->legacy_bbt().beats - 1) + (t->legacy_bbt().ticks / BBT_Time::ticks_per_beat);
if (prev_m) {
t->set_pulse (beat / prev_m->note_divisor());
} else {
/* really shouldn't happen but.. */
t->set_pulse (beat / 4.0);
}
}
prev_t = t;
}