summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_tempodisplay.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-03-01 03:59:32 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:10 +1000
commit474784c8bae262a7e310116b2b5250e5e925685a (patch)
treee646c2d788a50fdbe3a7423acb58eff6a7b1fc35 /gtk2_ardour/editor_tempodisplay.cc
parent0f8189928058ee6593b5b4e52e1a0c0a8ee4ce39 (diff)
Tempo ramps - setting bbt of an audio-locked tempo marker in the tempo dialog works.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 95fb178421..a971e98abe 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -378,8 +378,7 @@ Editor::edit_tempo_section (TempoSection* section)
if (tempo_dialog.get_lock_style() == MusicTime) {
_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), beat, tempo_dialog.get_tempo_type());
} else {
- _session->tempo_map().replace_c_func_from_tempo_and_beat (bpm, beat);
- framepos_t const f = _session->tempo_map().frame_at_beat (beat);
+ framepos_t const f = _session->tempo_map().compute_replacement_tempo_section (section, bpm, beat);
_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type());
}
XMLNode &after = _session->tempo_map().get_state();