From 78bca64a8198640628dc44ad6438ffbf2b9cf4b2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 9 Jul 2023 17:39:11 -0600 Subject: [PATCH] fix (and maybe break) two Drag classes that used the wrong name for setup_pointer_offset() This might have unexplored consequences --- gtk2_ardour/editor_drag.cc | 4 ++-- gtk2_ardour/editor_drag.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 00dc82c4c5..f08fdb3d50 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -7174,7 +7174,7 @@ RegionMarkerDrag::aborted (bool) } void -RegionMarkerDrag::setup_pointer_sample_offset () +RegionMarkerDrag::setup_pointer_offset () { const timepos_t model_abs_pos = rv->region ()->position () + (rv->region ()->start ().distance (model.position ())); _pointer_offset = model_abs_pos.distance (raw_grab_time ()); @@ -7236,7 +7236,7 @@ LollipopDrag::aborted (bool) } void -LollipopDrag::setup_pointer_sample_offset () +LollipopDrag::setup_pointer_offset () { NoteBase* note = static_cast (_primary->get_data (X_("note"))); _pointer_offset = _region->parent_rv.region()->source_beats_to_absolute_time (note->note()->time ()).distance (raw_grab_time ()); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index a2682826eb..53098e27ab 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -1539,7 +1539,7 @@ class RegionMarkerDrag : public Drag return false; } - void setup_pointer_sample_offset (); + void setup_pointer_offset (); private: RegionView* rv; @@ -1572,7 +1572,7 @@ class LollipopDrag : public Drag return false; } - void setup_pointer_sample_offset (); + void setup_pointer_offset (); private: VelocityGhostRegion* _region;