add frame parameter for Meter ctor and TempoMap::replace_meter(). allow for various failures.

1 files changed, 5 insertions, 5 deletions

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 4463ec825b..e98959ba9d 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -409,14 +409,14 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
 	meter_dialog.get_bbt_time (requested);
 
 	const double beat = map.beat_at_bbt (requested);
-
+	const double al_frame = map.frame_at_beat (beat);
 	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), beat, requested, MusicTime);
+		map.add_meter (Meter (bpb, note_type), beat, requested, 0, MusicTime);
 	} else {
-		map.add_meter (Meter (bpb, note_type), beat, requested, AudioTime);
+		map.add_meter (Meter (bpb, note_type), beat, requested, al_frame, AudioTime);
 	}
 
 	_session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
@@ -466,13 +466,13 @@ Editor::edit_meter_section (MeterSection* section)
 
 	Timecode::BBT_Time when;
 	meter_dialog.get_bbt_time (when);
-
+	const framepos_t frame = _session->tempo_map().frame_at_bbt (when);
 	const PositionLockStyle pls = (meter_dialog.get_lock_style() == AudioTime) ? AudioTime : MusicTime;
 
 	begin_reversible_command (_("replace meter mark"));
         XMLNode &before = _session->tempo_map().get_state();
 
-	_session->tempo_map().replace_meter (*section, meter, when, pls);
+	_session->tempo_map().replace_meter (*section, meter, when, frame, pls);
 
 	XMLNode &after = _session->tempo_map().get_state();
 	_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));