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_tempodisplay.cc | |
| parent | e5ba2bc34c400a533b3578ebe722eef0183a3d68 (diff) | |
Tempo ramps - fix ambiguous api, fix flickering tempo curves.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index f6251bd939..3ccaf78415 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -300,7 +300,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), pulse, TempoSection::Ramp); + map.add_tempo_pulse (map.tempo_at (frame), pulse, TempoSection::Ramp); XMLNode &after = map.get_state(); _session->add_command(new MementoCommand<TempoMap>(map, &before, &after)); @@ -340,9 +340,9 @@ Editor::mouse_add_new_meter_event (framepos_t frame) XMLNode &before = map.get_state(); if (meter_dialog.get_lock_style() == MusicTime) { - map.add_meter (Meter (bpb, note_type), map.bbt_to_beats (requested), requested); + map.add_meter_beat (Meter (bpb, note_type), map.bbt_to_beats (requested), requested); } else { - map.add_meter (Meter (bpb, note_type), map.frame_time (requested), map.bbt_to_beats (requested), requested); + map.add_meter_frame (Meter (bpb, note_type), map.frame_time (requested), map.bbt_to_beats (requested), requested); } _session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state())); @@ -396,9 +396,9 @@ Editor::edit_meter_section (MeterSection* section) XMLNode &before = _session->tempo_map().get_state(); section->set_position_lock_style (meter_dialog.get_lock_style()); if (meter_dialog.get_lock_style() == MusicTime) { - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when); + _session->tempo_map().replace_meter_bbt (*section, Meter (bpb, note_type), when); } else { - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), frame); + _session->tempo_map().replace_meter_frame (*section, Meter (bpb, note_type), frame); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); @@ -432,10 +432,10 @@ Editor::edit_tempo_section (TempoSection* section) section->set_position_lock_style (MusicTime); framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when); double const p = _session->tempo_map().predict_tempo_pulse (section, f); - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, tempo_dialog.get_tempo_type()); + _session->tempo_map().replace_tempo_pulse (*section, Tempo (bpm, nt), p, tempo_dialog.get_tempo_type()); } else { framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when); - _session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type()); + _session->tempo_map().replace_tempo_frame (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type()); } XMLNode &after = _session->tempo_map().get_state(); |