smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Tempo ramps - fix incorrect handling of unsloveable maps.

Browse source
This commit is contained in:
nick_m 2016-03-20 00:27:27 +11:00
parent b415b59f79
commit 17a6cda89a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/tempo.cc
View file

@ -1049,7 +1049,7 @@ TempoMap::predict_tempo_frame (TempoSection* section, const Tempo& bpm, const BB
if (solve_map (future_map, new_section, bpm, pulse_at_beat (future_map, beat))) {
ret = new_section->frame();
} else {
ret = frame_at_beat_locked (future_map, beat);
ret = frame_at_beat_locked (_metrics, beat);
}
Metrics::const_iterator d = future_map.begin();
@ -1071,7 +1071,7 @@ TempoMap::predict_tempo_beat (TempoSection* section, const Tempo& bpm, const fra
if (solve_map (future_map, new_section, bpm, frame)) {
ret = beat_at_pulse (future_map, new_section->pulse());
} else {
ret = beat_at_frame_locked (future_map, frame);
ret = beat_at_frame_locked (_metrics, frame);
}
Metrics::const_iterator d = future_map.begin();