diff options
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 3f08a8c750..b119aab1ea 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -5196,7 +5196,7 @@ NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *) /** @return Current total drag x change in frames */ frameoffset_t -NoteDrag::total_dx (GdkEvent const * event) const +NoteDrag::total_dx (guint const state) const { /* dx in frames */ frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x()); @@ -5205,7 +5205,7 @@ NoteDrag::total_dx (GdkEvent const * event) const frameoffset_t const n = _region->source_beats_to_absolute_frames (_primary->note()->time ()); /* new time of the primary note in session frames */ - frameoffset_t st = n + dx + snap_delta (event->button.state); + frameoffset_t st = n + dx + snap_delta (state); framepos_t const rp = _region->region()->position (); @@ -5213,7 +5213,7 @@ NoteDrag::total_dx (GdkEvent const * event) const st = max (st, rp); /* snap and return corresponding delta */ - return _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta (event->button.state); + return _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta (state); } /** @return Current total drag y change in note number */ @@ -5235,7 +5235,7 @@ void NoteDrag::motion (GdkEvent * event, bool) { /* Total change in x and y since the start of the drag */ - frameoffset_t const dx = total_dx (event); + frameoffset_t const dx = total_dx (event->button.state); int8_t const dy = total_dy (); /* Now work out what we have to do to the note canvas items to set this new drag delta */ @@ -5304,7 +5304,7 @@ NoteDrag::finished (GdkEvent* ev, bool moved) } } } else { - _region->note_dropped (_primary, total_dx (ev), total_dy()); + _region->note_dropped (_primary, total_dx (ev->button.state), total_dy()); } } diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index b11b1c26a1..7d02a23e52 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -527,7 +527,7 @@ class NoteDrag : public Drag private: - ARDOUR::frameoffset_t total_dx (GdkEvent const *) const; + ARDOUR::frameoffset_t total_dx (guint const) const; int8_t total_dy () const; MidiRegionView* _region; |