More cleanup

	- remove "no_magnets" ugh.

1 files changed, 4 insertions, 14 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 05f9b0ca93..45c7ca94b0 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2609,23 +2609,13 @@ Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, RoundM
 }
 
 void
-Editor::snap_to (framepos_t& start, RoundMode direction, bool for_mark)
+Editor::snap_to (framepos_t& start, RoundMode direction, bool for_mark, bool explicitly)
 {
 	if (!_session || _snap_mode == SnapOff) {
 		return;
 	}
 
-	snap_to_internal (start, direction, for_mark);
-}
-
-void
-Editor::snap_to_no_magnets (framepos_t& start, RoundMode direction, bool for_mark)
-{
-	if (!_session || _snap_mode == SnapOff) {
-		return;
-	}
-
-	snap_to_internal (start, direction, for_mark, true);
+	snap_to_internal (start, direction, for_mark, explicitly);
 }
 
 void
@@ -2695,7 +2685,7 @@ Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool
 }
 
 void
-Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, bool no_magnets)
+Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, bool explicitly)
 {
 	const framepos_t one_second = _session->frame_rate();
 	const framepos_t one_minute = _session->frame_rate() * 60;
@@ -2865,7 +2855,7 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark,
 
 	case SnapMagnetic:
 
-		if (no_magnets) {
+		if (explicitly) {
 			return;
 		}