Make Cut mode respect snap modifer

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 6a663daf9f93620f997c3f7569d4f68679165132..4e52649850872b6f96804d820a251e9a5e50ae63 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -6333,34 +6333,18 @@ NoteCreateDrag::aborted (bool)
 
 }
 
-PercussiveCreateDrag::PercussiveCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView* rv)
+HitCreateDrag::HitCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView* rv)
        : Drag (e, i)
        , _region_view (rv)
-       , _y (0.0)
 {
 }
 
-PercussiveCreateDrag::~PercussiveCreateDrag ()
+HitCreateDrag::~HitCreateDrag ()
 {
 }
 
-framecnt_t
-PercussiveCreateDrag::grid_frames (framepos_t t) const
-{
-       bool success;
-       Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, t);
-       if (!success) {
-               grid_beats = Evoral::Beats(1);
-       }
-       const Evoral::Beats t_beats = _region_view->region_frames_to_region_beats (t);
-
-       return _region_view->region_beats_to_region_frames (t_beats + grid_beats)
-               - _region_view->region_beats_to_region_frames (t_beats);
-
-}
-
 void
-PercussiveCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
+HitCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 {
        Drag::start_grab (event, cursor);
 
@@ -6379,23 +6363,28 @@ PercussiveCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
        const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position();
 
        MidiStreamView* sv = _region_view->midi_stream_view ();
-       _y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y)));
+       const double y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y)));
 
-       _region_view->create_note_at (start, _y,  grid_beats, event->button.state, false);
+       _region_view->create_note_at (start, y,  grid_beats, event->button.state, false);
 }
 
 void
-PercussiveCreateDrag::motion (GdkEvent* event, bool)
+HitCreateDrag::motion (GdkEvent* event, bool)
 {
        TempoMap& map (_editor->session()->tempo_map());
 
        const framepos_t pf = _drags->current_pointer_frame ();
        const int32_t divisions = _editor->get_grid_music_divisions (event->button.state);
+
+       if (divisions == 0) {
+               return;
+       }
+
        const double eqaf = map.exact_qn_at_frame (pf, divisions);
        const framepos_t start = map.frame_at_quarter_note (eqaf) - _region_view->region()->position ();
 
        MidiStreamView* sv = _region_view->midi_stream_view ();
-       _y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y)));
+       const double y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y)));
 
        bool success = false;
        Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, pf);
@@ -6403,18 +6392,18 @@ PercussiveCreateDrag::motion (GdkEvent* event, bool)
                grid_beats = Evoral::Beats(1);
        }
 
-       _region_view->create_note_at (start, _y, grid_beats, event->button.state, false);
+       _region_view->create_note_at (start, y, grid_beats, event->button.state, false);
 
 }
 
 void
-PercussiveCreateDrag::finished (GdkEvent* /* ev */, bool /* had_movement */)
+HitCreateDrag::finished (GdkEvent* /* ev */, bool /* had_movement */)
 {
 
 }
 
 double
-PercussiveCreateDrag::y_to_region (double y) const
+HitCreateDrag::y_to_region (double y) const
 {
        double x = 0;
        _region_view->get_canvas_group()->canvas_to_item (x, y);
@@ -6422,7 +6411,7 @@ PercussiveCreateDrag::y_to_region (double y) const
 }
 
 void
-PercussiveCreateDrag::aborted (bool)
+HitCreateDrag::aborted (bool)
 {
        // umm..
 }
@@ -6529,6 +6518,7 @@ RegionCutDrag::RegionCutDrag (Editor* e, ArdourCanvas::Item* item, framepos_t po
 {
        line->set_position (pos);
        line->show ();
+       line->track_canvas_item().reparent (_editor->_drag_motion_group);
 }
 
 RegionCutDrag::~RegionCutDrag ()
@@ -6537,12 +6527,19 @@ RegionCutDrag::~RegionCutDrag ()
 }
 
 void
-RegionCutDrag::motion (GdkEvent*, bool)
+RegionCutDrag::start_grab (GdkEvent* event, Gdk::Cursor* c)
+{
+       Drag::start_grab (event, c);
+       motion (event, false);
+}
+
+void
+RegionCutDrag::motion (GdkEvent* event, bool)
 {
-       framepos_t where = _drags->current_pointer_frame();
-       _editor->snap_to (where);
+       framepos_t pos = _drags->current_pointer_frame();
+       _editor->snap_to_with_modifier (pos, event);
 
-       line->set_position (where);
+       line->set_position (pos);
 }
 
 void
@@ -6551,6 +6548,7 @@ RegionCutDrag::finished (GdkEvent* event, bool)
        _editor->get_track_canvas()->canvas()->re_enter();
 
        framepos_t pos = _drags->current_pointer_frame();
+       _editor->snap_to_with_modifier (pos, event);
 
        line->hide ();
 
@@ -6560,7 +6558,8 @@ RegionCutDrag::finished (GdkEvent* event, bool)
                return;
        }
 
-       _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state));
+       _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state),
+                                  false);
 }
 
 void