Magnetic snap now works on note moves / resizes.

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 9d2c53964eb507efaaa231dbb0de3e155c1fb991..b079972a1b32f64493692f96360bafb6a08de3ac 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -5280,7 +5280,7 @@ NoteDrag::total_dx (const guint state) const
 
        frameoffset_t ret;
        if (snap) {
-               ret =  _region->snap_frame_to_frame (st - rp, snap) + rp - n - snap_delta (state);
+               ret =  _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta (state);
        } else {
                ret = st - n - snap_delta (state);
        }

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index fd869af0e7d019cd46ba411e43e701bb8e3e5c40..47e5510664991640a478817f41e9bd8feac063a2 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -2785,14 +2785,14 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
 
                if (at_front) {
                        if (with_snap) {
-                               resize_rect->set_x0 (snap_to_pixel(current_x, true) - snap_delta);
+                               resize_rect->set_x0 (snap_to_pixel(current_x) - snap_delta);
                        } else {
                                resize_rect->set_x0 (current_x - snap_delta);
                        }
                        resize_rect->set_x1 (canvas_note->x1());
                } else {
                        if (with_snap) {
-                               resize_rect->set_x1 (snap_to_pixel(current_x, true) - snap_delta);
+                               resize_rect->set_x1 (snap_to_pixel(current_x) - snap_delta);
                        } else {
                                resize_rect->set_x1 (current_x - snap_delta);
                        }
@@ -2813,7 +2813,7 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
                                sign = -1;
                        }
 
-                       const double  snapped_x = (with_snap ? snap_pixel_to_sample (current_x, true) : trackview.editor ().pixel_to_sample (current_x));
+                       const double  snapped_x = (with_snap ? snap_pixel_to_sample (current_x) : trackview.editor ().pixel_to_sample (current_x));
                        Evoral::Beats beats     = region_frames_to_region_beats (snapped_x);
                        Evoral::Beats len       = Evoral::Beats();
 
@@ -2895,7 +2895,7 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_
                /* Convert the new x position to a frame within the source */
                framepos_t current_fr;
                if (with_snap) {
-                       current_fr = snap_pixel_to_sample (current_x, with_snap) + _region->start ();
+                       current_fr = snap_pixel_to_sample (current_x) + _region->start ();
                } else {
                        current_fr = trackview.editor().pixel_to_sample (current_x) + _region->start ();
                }