diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-02-28 23:09:02 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | c7ff67004a51ae3f0453531c3d64bd9876f1df3b (patch) | |
| tree | 18db05ad9d30cd3766e1e7c4e980c41b69c01ee0 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | d7ec204bf67ced9c3fb8ba41bdbd73af356fb1c8 (diff) | |
Tempo ramps - fix messed up meter section state, audio-locked tempos ignore the bbt setting in the tempo dialog for now.
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 53cc28cd63..6e28b32e77 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -345,7 +345,7 @@ Editor::edit_meter_section (MeterSection* section) if (meter_dialog.get_lock_style() == MusicTime) { _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when); } else { - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), frame); + _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), section->frame()); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); @@ -378,7 +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_tempo (*section, Tempo (bpm, nt), _session->tempo_map().frame_at_beat (beat), tempo_dialog.get_tempo_type()); + _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), section->frame(), tempo_dialog.get_tempo_type()); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); |