diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-21 01:45:37 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:16 +1000 |
| commit | 074db3b861926012e9434fe15135ac401da6cb5c (patch) | |
| tree | 1ac4d982f61a0c610216d5a04531791ed681b116 /gtk2_ardour/editor_markers.cc | |
| parent | 82d876b48b9de4e178547d00e91e6aa098ae56a7 (diff) | |
Tempo ramps - more code consolidation wrt add meter/tempo.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 635131fdd1..9808777083 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1391,11 +1391,10 @@ Editor::toggle_marker_lock_style () begin_reversible_command (_("change meter lock style")); XMLNode &before = _session->tempo_map().get_state(); MeterSection* msp = &mm->meter(); - if (mm->meter().position_lock_style() == AudioTime) { - _session->tempo_map().replace_meter_bbt (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt()); - } else { - _session->tempo_map().replace_meter_frame (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->frame()); - } + const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; + + _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt(), msp->frame(), pls); + XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); commit_reversible_command (); @@ -1404,6 +1403,7 @@ Editor::toggle_marker_lock_style () XMLNode &before = _session->tempo_map().get_state(); TempoSection* tsp = &tm->tempo(); const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; + _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->frame(), tsp->type(), pls); XMLNode &after = _session->tempo_map().get_state(); |