From 99653ae2cadf1f082d03ff7577636ac0b79deca3 Mon Sep 17 00:00:00 2001 From: nick_m Date: Tue, 5 Jul 2016 01:11:48 +1000 Subject: Simplify Editor::mouse_add_new_meter_event() a bit. --- gtk2_ardour/editor_tempodisplay.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/editor_tempodisplay.cc') diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 6c009b66e2..ba73a01f0b 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -353,17 +353,19 @@ Editor::mouse_add_new_meter_event (framepos_t frame) bpb = max (1.0, bpb); // XXX is this a reasonable limit? double note_type = meter_dialog.get_note_type (); - Timecode::BBT_Time requested; + Timecode::BBT_Time requested; meter_dialog.get_bbt_time (requested); + const double beat = map.beat_at_bbt (requested); + begin_reversible_command (_("add meter mark")); XMLNode &before = map.get_state(); if (meter_dialog.get_lock_style() == MusicTime) { - map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_at_bbt (requested), MusicTime); + map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), MusicTime); } else { - map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_at_bbt (requested), AudioTime); + map.add_meter (Meter (bpb, note_type), beat, requested, map.frame_at_beat (beat), AudioTime); } _session->add_command(new MementoCommand(map, &before, &map.get_state())); -- cgit v1.2.3