::find_next_event() does not need to be a pure virtual in ControlSet (it can originat...

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 34a80dfc9371dea42a22008b94e0f44b929a6ede..b71ab32087ae52c959ba99d21c25c099c94d6de1 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -452,15 +452,14 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
        Timecode::BBT_Time requested;
        meter_dialog.get_bbt_time (requested);
 
-       const double beat = map.beat_at_bbt (requested);
-       const double al_frame = map.frame_at_beat (beat);
+       const double al_frame = map.frame_at_bbt (requested);
        begin_reversible_command (_("add meter mark"));
-        XMLNode &before = map.get_state();
+       XMLNode &before = map.get_state();
 
        if (meter_dialog.get_lock_style() == MusicTime) {
-               map.add_meter (Meter (bpb, note_type), beat, requested, 0, MusicTime);
+               map.add_meter (Meter (bpb, note_type), requested, 0, MusicTime);
        } else {
-               map.add_meter (Meter (bpb, note_type), beat, requested, al_frame, AudioTime);
+               map.add_meter (Meter (bpb, note_type), requested, al_frame, AudioTime);
        }
 
        _session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
@@ -514,7 +513,7 @@ Editor::edit_meter_section (MeterSection* section)
        const PositionLockStyle pls = (meter_dialog.get_lock_style() == AudioTime) ? AudioTime : MusicTime;
 
        begin_reversible_command (_("replace meter mark"));
-        XMLNode &before = _session->tempo_map().get_state();
+       XMLNode &before = _session->tempo_map().get_state();
 
        _session->tempo_map().replace_meter (*section, meter, when, frame, pls);