diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-02-29 04:54:24 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | b8b6d562a46ca4410142f5a83bb2396a0ba0fde7 (patch) | |
| tree | a98a08eae7eadc985cff482fbad9c2509f71fe17 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | c98e008745c506b1ce6610ac27fe1f50809834cb (diff) | |
Tempo ramps - restore bbt settings in tempo dialog for audio-locked tempo markers
- see comments
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 6e28b32e77..95fb178421 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -378,7 +378,9 @@ 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_tempo (*section, Tempo (bpm, nt), section->frame(), tempo_dialog.get_tempo_type()); + _session->tempo_map().replace_c_func_from_tempo_and_beat (bpm, beat); + framepos_t const f = _session->tempo_map().frame_at_beat (beat); + _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type()); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); |