Tempo ramps - api change, remove some code.

3 files changed, 12 insertions, 12 deletions

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index dc7eb3586c..d8618ffca4 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3180,9 +3180,9 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
 	_marker->set_position (pf);
 	if (_marker->meter().position_lock_style() == MusicTime) {
 		double const baf = _editor->session()->tempo_map().beat_at_frame (_editor->session()->tempo_map().round_to_bar (pf, (RoundMode) 0));
-		_editor->session()->tempo_map().gui_move_meter (_real_section, _marker->meter(), baf);
+		_editor->session()->tempo_map().gui_move_meter (_real_section, baf);
 	} else {
-		_editor->session()->tempo_map().gui_move_meter (_real_section, _marker->meter(), pf);
+		_editor->session()->tempo_map().gui_move_meter (_real_section, pf);
 	}
 	show_verbose_cursor_time (pf);
 }
@@ -3352,7 +3352,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 
 			if (_real_section->position_lock_style() == MusicTime) {
 
-				const double pulse = map.predict_tempo_pulse (_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type()), pf);
+				const double pulse = map.predict_tempo_pulse (_real_section, pf);
 				when = map.pulse_to_bbt (pulse);
 				if (use_snap && _editor->snap_type() == SnapToBar) {
 					map.round_bbt (when, -1);
@@ -3360,15 +3360,15 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 					map.round_bbt (when, _editor->get_grid_beat_divisions (0));
 				}
 				const double beat = map.bbt_to_beats (when);
-				map.gui_move_tempo_beat (_real_section, tp, beat);
+				map.gui_move_tempo_beat (_real_section, beat);
 			} else {
 				if (use_snap && _editor->snap_type() == SnapToBar) {
 					map.round_bbt (when, -1);
 				} else if (use_snap) {
 					map.round_bbt (when, _editor->get_grid_beat_divisions (0));
 				}
-				pf = map.predict_tempo_frame (_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type()), when);
-				map.gui_move_tempo_frame (_real_section, tp, pf);
+				pf = map.predict_tempo_frame (_real_section, when);
+				map.gui_move_tempo_frame (_real_section, pf);
 			}
 		}
 
@@ -3399,7 +3399,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 		XMLNode &before = map.get_state();
 
 		if (_marker->tempo().position_lock_style() == MusicTime) {
-			double const pulse = map.predict_tempo_pulse (_real_section, _marker->tempo(), _real_section->frame());
+			double const pulse = map.predict_tempo_pulse (_real_section, _real_section->frame());
 			map.add_tempo (_marker->tempo(), pulse, _marker->tempo().type());
 		} else {
 			map.add_tempo (_marker->tempo(), _real_section->frame(), _marker->tempo().type());
@@ -3411,7 +3411,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 
 	} else {
 		if (_marker->tempo().position_lock_style() == MusicTime) {
-			double const pulse = map.predict_tempo_pulse (_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type()), _real_section->frame());
+			double const pulse = map.predict_tempo_pulse (_real_section, _real_section->frame());
 			map.replace_tempo (*_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type())
 					   , pulse, _marker->tempo().type());
 		} else {
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index b6db6280e4..3931e0bf09 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -378,11 +378,11 @@ Editor::edit_tempo_section (TempoSection* section)
 
 	if (tempo_dialog.get_lock_style() == MusicTime) {
 		section->set_position_lock_style (MusicTime);
-		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, Tempo (bpm, nt), when);
-		double const p = _session->tempo_map().predict_tempo_pulse (section, Tempo (bpm, nt), f);
+		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, tempo_dialog.get_tempo_type());
 	} else {
-		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, Tempo (bpm, nt), when);
+		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
 		_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type());
 	}
 
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 0cd616a1ff..687c428e5b 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -277,7 +277,7 @@ TempoDialog::entry_key_release (GdkEventKey*)
 	get_bbt_time (bbt);
 
 	if (_section && is_user_input_valid()) {
-		set_response_sensitive (RESPONSE_ACCEPT, _map->can_solve_bbt (_section, Tempo (get_bpm(), get_note_type()), bbt));
+		set_response_sensitive (RESPONSE_ACCEPT, _map->can_solve_bbt (_section, bbt));
 	} else {
 		set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
 	}