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_tempodisplay.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_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 162179a7b9..35b4783f20 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -404,7 +404,7 @@ Editor::mouse_add_new_tempo_event (framepos_t frame) if (pulse > 0.0) { XMLNode &before = map.get_state(); /* add music-locked ramped (?) tempo using the bpm/note type at frame*/ - map.add_tempo (map.tempo_at_frame (frame), pulse, 0, TempoSection::Ramp, MusicTime); + map.add_tempo (map.tempo_at_frame (frame), pulse, 0, MusicTime); XMLNode &after = map.get_state(); _session->add_command(new MementoCommand<TempoMap>(map, &before, &after)); @@ -531,17 +531,15 @@ Editor::edit_tempo_section (TempoSection* section) Timecode::BBT_Time when; tempo_dialog.get_bbt_time (when); - const TempoSection::Type ttype (tempo_dialog.get_tempo_type()); - begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); if (tempo_dialog.get_lock_style() == AudioTime) { framepos_t const f = _session->tempo_map().predict_tempo_position (section, when).second; - _session->tempo_map().replace_tempo (*section, tempo, 0.0, f, ttype, AudioTime); + _session->tempo_map().replace_tempo (*section, tempo, 0.0, f, AudioTime); } else { double const p = _session->tempo_map().predict_tempo_position (section, when).first; - _session->tempo_map().replace_tempo (*section, tempo, p, 0, ttype, MusicTime); + _session->tempo_map().replace_tempo (*section, tempo, p, 0, MusicTime); } XMLNode &after = _session->tempo_map().get_state(); |