diff options
author | nick_m <mainsbridge@gmail.com> | 2017-02-26 02:22:19 +1100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-02-27 20:16:10 +0100 |
commit | 97c4c2a28c19b7979ecbfd2eff28a351dfae1e6a (patch) | |
tree | 01a697ce2c07e532170288d33fae384d07b4f8ce /gtk2_ardour/editor_markers.cc | |
parent | ac19a51d38906f347baeb767d9b011955030921c (diff) |
complete changes to tempo type.
- this implements in the intention behind the previous commit.
a tempo mark is constant until its end has been changed by a
shift-drag on the next marker.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 7918cec6cb..23ab470f7c 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1417,21 +1417,20 @@ Editor::toggle_marker_lock_style () const double pulse = tsp->pulse(); const framepos_t frame = tsp->frame(); - const TempoSection::Type type = tsp->type(); const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime; const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute()); begin_reversible_command (_("change tempo lock style")); XMLNode &before = _session->tempo_map().get_state(); - _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls); + _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls); XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); commit_reversible_command (); } } - +/* actally just resets the ts to constant using initial tempo */ void Editor::toggle_tempo_type () { @@ -1442,16 +1441,15 @@ Editor::toggle_tempo_type () if (tm) { TempoSection* tsp = &tm->tempo(); - const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute()); + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type()); const double pulse = tsp->pulse(); const framepos_t frame = tsp->frame(); - const TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp; const PositionLockStyle pls = tsp->position_lock_style(); - begin_reversible_command (_("change tempo type")); + begin_reversible_command (_("set tempo to constant")); XMLNode &before = _session->tempo_map().get_state(); - _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, type, pls); + _session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls); XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); |