Remove some redundant calls to snap_to(). get_preferred_edit_position() already...

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index dbe49a09132c4ecf9e60d7781f6d560d695c2832..ed49077670c23c3299f7071c12bf0a26416feee0 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -542,7 +542,7 @@ public:
 
        /* editing operations that need to be public */
        void mouse_add_new_marker (samplepos_t where, bool is_cd=false);
-       void split_regions_at (ARDOUR::MusicSample, RegionSelection&, bool snap = true);
+       void split_regions_at (ARDOUR::MusicSample, RegionSelection&);
        void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false);
        RegionSelection get_regions_from_selection_and_mouse (samplepos_t);
 

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 39fbdca221956ddcc3f026b7e47d0fe3bb93f3ba..0c23fd6581d0ca96b556568e0b978e95e2fa57b3 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -6994,7 +6994,7 @@ RegionCutDrag::finished (GdkEvent* event, bool)
                return;
        }
 
-       _editor->split_regions_at (pos, rs, false);
+       _editor->split_regions_at (pos, rs);
 }
 
 void

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 2be9f8d6de3fc56878e342421ee1a85c1aa6b287..acf7d2a14308b95c04dd4659bcbdcbc5f6aa52cb 100644 (file)
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -51,9 +51,6 @@ Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
                        end = get_preferred_edit_position(ign);
                }
 
-               //snap the selection start/end
-               snap_to (start);
-
                //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
                if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() )
                        select_all_tracks();
@@ -80,9 +77,6 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
                        start.sample = get_preferred_edit_position(ign);
                }
 
-               //snap the selection start/end
-               snap_to(start);
-
                //if there's not already a sensible selection endpoint, go "forever"
                if (start.sample > end.sample) {
 #ifdef MIXBUS

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index cf9118fa11d606450f3a668e5249b275e43006e5..1ae5dc449b65a5d263f09e1baaa13da99da92784 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -173,7 +173,7 @@ Editor::redo (uint32_t n)
 }
 
 void
-Editor::split_regions_at (MusicSample where, RegionSelection& regions, bool snap_sample)
+Editor::split_regions_at (MusicSample where, RegionSelection& regions)
 {
        bool frozen = false;
 
@@ -189,25 +189,11 @@ Editor::split_regions_at (MusicSample where, RegionSelection& regions, bool snap
 
        begin_reversible_command (_("split"));
 
-       // if splitting a single region, and snap-to is using
-       // region boundaries, don't pay attention to them
 
        if (regions.size() == 1) {
-//             switch (_snap_type) {   //ToDo !!!
-//             case SnapToRegionStart:
-//             case SnapToRegionSync:
-//             case SnapToRegionEnd:
-//                     break;
-//             default:
-//                     if (snap_sample) {
-                               snap_to (where);
-//                     }
-//             }
+               /* TODO:  if splitting a single region, and snap-to is using
+                region boundaries, mabye we shouldn't pay attention to them? */
        } else {
-               if (snap_sample) {
-                       snap_to (where);
-               }
-
                frozen = true;
                EditorFreeze(); /* Emit Signal */
        }
@@ -6618,9 +6604,6 @@ Editor::set_punch_start_from_edit_point ()
                        start.sample = get_preferred_edit_position();
                }
 
-               //snap the selection start/end
-               snap_to(start);
-
                //if there's not already a sensible selection endpoint, go "forever"
                if (start.sample > end) {
                        end = max_samplepos;
@@ -6651,9 +6634,6 @@ Editor::set_punch_end_from_edit_point ()
                        end.sample = get_preferred_edit_position();
                }
 
-               //snap the selection start/end
-               snap_to (end);
-
                set_punch_range (start, end.sample, _("set punch end from EP"));
 
        }
@@ -6679,9 +6659,6 @@ Editor::set_loop_start_from_edit_point ()
                        start.sample = get_preferred_edit_position();
                }
 
-               //snap the selection start/end
-               snap_to (start);
-
                //if there's not already a sensible selection endpoint, go "forever"
                if (start.sample > end) {
                        end = max_samplepos;
@@ -6712,9 +6689,6 @@ Editor::set_loop_end_from_edit_point ()
                        end.sample = get_preferred_edit_position();
                }
 
-               //snap the selection start/end
-               snap_to(end);
-
                set_loop_range (start, end.sample, _("set loop end from EP"));
        }
 }

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 3da2be4f40841c2a7c0b0c9f056b3a37401da755..6d6ff3354759f63c594b52de4318c86d682bd637 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -328,7 +328,7 @@ public:
        virtual void restore_editing_space () = 0;
        virtual samplepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0;
        virtual void toggle_meter_updating() = 0;
-       virtual void split_regions_at (ARDOUR::MusicSample, RegionSelection&, bool snap) = 0;
+       virtual void split_regions_at (ARDOUR::MusicSample, RegionSelection&) = 0;
        virtual void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0;
        virtual void mouse_add_new_marker (samplepos_t where, bool is_cd=false) = 0;
        virtual void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>) = 0;