diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-24 04:17:35 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | 6309807bc77347ad2889a3e08fa2721ffa345194 (patch) | |
| tree | 48acdc99a4aeacfd675e71557c7d67c2d5842994 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | f54b75c869348501a4603bfe7adce46b50781b5b (diff) | |
Tempo ramps - rename for consistency, remove some testing code, add meter based bbt->pulse conversions.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 82906137c7..e0af960d40 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -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, 0, MusicTime); + map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, 0, MusicTime); } else { - map.add_meter (Meter (bpb, note_type), map.bbt_to_beats (requested), requested, map.frame_time (requested), AudioTime); + map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_time (requested), AudioTime); } _session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state())); @@ -389,8 +389,8 @@ Editor::edit_meter_section (MeterSection* section) double const note_type = meter_dialog.get_note_type (); Timecode::BBT_Time when; - meter_dialog.get_bbt_time(when); - framepos_t const frame = _session->tempo_map().frame_at_beat (_session->tempo_map().bbt_to_beats (when)); + meter_dialog.get_bbt_time (when); + framepos_t const frame = _session->tempo_map().frame_time (when); begin_reversible_command (_("replace meter mark")); XMLNode &before = _session->tempo_map().get_state(); |