Tempo ramps - clean up add/replace tempo

2 files changed, 9 insertions, 21 deletions

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index a1fef51d67..635131fdd1 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1403,11 +1403,9 @@ Editor::toggle_marker_lock_style ()
 		begin_reversible_command (_("change tempo lock style"));
 		XMLNode &before = _session->tempo_map().get_state();
 		TempoSection* tsp = &tm->tempo();
-		if (tsp->position_lock_style() == AudioTime) {
-			_session->tempo_map().replace_tempo_pulse (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->type());
-		} else {
-			_session->tempo_map().replace_tempo_frame (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->frame(), tsp->type());
-		}
+		const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
+		_session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->frame(), tsp->type(), pls);
+
 		XMLNode &after = _session->tempo_map().get_state();
 		_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 		commit_reversible_command ();
@@ -1425,13 +1423,9 @@ Editor::toggle_tempo_type ()
 		begin_reversible_command (_("change tempo type"));
 		XMLNode &before = _session->tempo_map().get_state();
 		TempoSection* tsp = &tm->tempo();
-		if (tsp->position_lock_style() == AudioTime) {
-			_session->tempo_map().replace_tempo_frame (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type())
-								   , tsp->frame(), (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp);
-		} else {
-			_session->tempo_map().replace_tempo_pulse (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type())
-								   , tsp->pulse(), (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp);
-		}
+		const TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp;
+		_session->tempo_map().replace_tempo (*tsp, Tempo (tsp->beats_per_minute(), tsp->note_type()), tsp->pulse(), tsp->frame()
+						     , type, tsp->position_lock_style());
 
 		XMLNode &after = _session->tempo_map().get_state();
 		_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 3058323c5a..adc7247e8b 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -428,15 +428,9 @@ Editor::edit_tempo_section (TempoSection* section)
 	begin_reversible_command (_("replace tempo mark"));
 	XMLNode &before = _session->tempo_map().get_state();
 
-	if (tempo_dialog.get_lock_style() == MusicTime) {
-		section->set_position_lock_style (MusicTime);
-		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
-		double const p = _session->tempo_map().predict_tempo_pulse (section, f);
-		_session->tempo_map().replace_tempo_pulse (*section, Tempo (bpm, nt), p, tempo_dialog.get_tempo_type());
-	} else {
-		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
-		_session->tempo_map().replace_tempo_frame (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type());
-	}
+	framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
+	double const p = _session->tempo_map().predict_tempo_pulse (section, f);
+	_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, f, tempo_dialog.get_tempo_type(), tempo_dialog.get_lock_style());
 
 	XMLNode &after = _session->tempo_map().get_state();
 	_session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));