diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-21 05:33:31 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | f182235410d3121929c8357cf61bc66f56a2b4a0 (patch) | |
| tree | 4212903234bf6d4348e2756273253f82e1a04a3c /gtk2_ardour/editor_tempodisplay.cc | |
| parent | d1a075110afa8efe1944ba7a9a2ba6be985c8291 (diff) | |
Tempo ramps - consolidate TempoMap::predict_tempo()
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index e2540ddfd0..9fdae28b30 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -426,10 +426,10 @@ Editor::edit_tempo_section (TempoSection* section) XMLNode &before = _session->tempo_map().get_state(); if (tempo_dialog.get_lock_style() == AudioTime) { - framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when); + framepos_t const f = _session->tempo_map().predict_tempo (section, when).second; _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), 0.0, f, tempo_dialog.get_tempo_type(), AudioTime); } else { - double const p = _session->tempo_map().predict_tempo_pulse (section, when); + double const p = _session->tempo_map().predict_tempo (section, when).first; _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, 0, tempo_dialog.get_tempo_type(), MusicTime); } |