summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_tempodisplay.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-05-27 03:22:24 +1000
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:17 +1000
commit34c9ac9dd7b1187d9efa2c6894fccba34fe298cd (patch)
treea44a03530b47c2a8c63f78180a44e5e2f4ac8e8a /gtk2_ardour/editor_tempodisplay.cc
parentb564f07635ea917ec574361346ab12d7fa733289 (diff)
Tempo ramps - rename bbt_time() -> bbt_at_frame(), frame_time() -> frame_at_bbt()
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index adf0f72fe3..7af6fef059 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -358,7 +358,7 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
if (meter_dialog.get_lock_style() == 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.beat_at_bbt (requested), requested, map.frame_time (requested), AudioTime);
+ map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_at_bbt (requested), AudioTime);
}
_session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
@@ -406,7 +406,7 @@ 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_time (when);
+ framepos_t const frame = _session->tempo_map().frame_at_bbt (when);
begin_reversible_command (_("replace meter mark"));
XMLNode &before = _session->tempo_map().get_state();