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

Tempo ramps - fix mucally-snapped dragging across the 'no time' gap (audio-locked meters).

Browse Source
This commit is contained in:
nick_m
2016-04-17 06:48:49 +10:00
parent 8b0a2897b9
commit 7b9eec5678
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/ardour/tempo.cc
View File

@@ -1540,12 +1540,30 @@ TempoMap::frame_at_pulse (const double& pulse) const
double
TempoMap::beat_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const
{
const MeterSection& prev_m = meter_section_at_locked (metrics, frame);
const TempoSection& ts = tempo_section_at_locked (metrics, frame);
if (frame < prev_m.frame()) {
MeterSection* prev_m = 0;
MeterSection* next_m = 0;
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
MeterSection* m;
if ((m = dynamic_cast<MeterSection*> (*i)) != 0) {
if (prev_m && m->frame() > frame) {
next_m = m;
break;
}
prev_m = m;
}
}
if (frame < prev_m->frame()) {
return 0.0;
}
return prev_m.beat() + (ts.pulse_at_frame (frame, _frame_rate) - prev_m.pulse()) * prev_m.note_divisor();
const double beat = prev_m->beat() + (ts.pulse_at_frame (frame, _frame_rate) - prev_m->pulse()) * prev_m->note_divisor();
if (next_m && next_m->beat() < beat) {
return next_m->beat();
}
return beat;
}
double