diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-19 01:01:08 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:16 +1000 |
| commit | 2d3d7a53556a0b724c91db0dbf991e3d7a78b4fe (patch) | |
| tree | 5b95d1e2e4389d835f4a7033994fb9c62e97344b /gtk2_ardour/editor_markers.cc | |
| parent | e5ba2bc34c400a533b3578ebe722eef0183a3d68 (diff) | |
Tempo ramps - fix ambiguous api, fix flickering tempo curves.
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index e8b37606d6..a1fef51d67 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1392,9 +1392,9 @@ Editor::toggle_marker_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 (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt()); + _session->tempo_map().replace_meter_bbt (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->bbt()); } else { - _session->tempo_map().replace_meter (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->frame()); + _session->tempo_map().replace_meter_frame (*msp, Meter (msp->divisions_per_bar(), msp->note_divisor()), msp->frame()); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); @@ -1404,9 +1404,9 @@ Editor::toggle_marker_lock_style () XMLNode &before = _session->tempo_map().get_state(); TempoSection* tsp = &tm->tempo(); if (tsp->position_lock_style() == AudioTime) { - _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->type()); + _session->tempo_map().replace_tempo_pulse (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->type()); } else { - _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->frame(), tsp->type()); + _session->tempo_map().replace_tempo_frame (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->frame(), tsp->type()); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); @@ -1426,9 +1426,11 @@ Editor::toggle_tempo_type () XMLNode &before = _session->tempo_map().get_state(); TempoSection* tsp = &tm->tempo(); if (tsp->position_lock_style() == AudioTime) { - _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->frame(), (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp); + _session->tempo_map().replace_tempo_frame (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()) + , tsp->frame(), (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp); } else { - _session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp); + _session->tempo_map().replace_tempo_pulse (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()) + , tsp->pulse(), (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp); } XMLNode &after = _session->tempo_map().get_state(); |