More cleanup

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 8362b00551e229a67b4eb854a7d95485a009528d..663a97a56dbda292a826c9847484fbf38247968e 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -436,11 +436,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void snap_to (framepos_t&       first,
                      ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                     bool              for_mark  = false);
-
-       void snap_to_no_magnets (framepos_t&       first,
-                     ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                     bool              for_mark  = false);
+                     bool              for_mark  = false,
+                     bool              explicitly = false);
 
        void snap_to_with_modifier (framepos_t&       first,
                                    GdkEvent const *  ev,
@@ -2136,7 +2133,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void snap_to_internal (framepos_t&       first,
                               ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
                               bool              for_mark  = false,
-                              bool              no_magnets = false);
+                              bool              explicitly = false);
 
        void timecode_snap_to_internal (framepos_t&       first,
                                        ARDOUR::RoundMode direction = ARDOUR::RoundNearest,