diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index d88c5c79a3..a8b161cbe9 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -6796,8 +6796,8 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) * coordinates relative to the region in order to draw it correctly. */ - const timecnt_t rrp1 (_midi_view->relative_position (_note[0])); - const timecnt_t rrp2 (_midi_view->relative_position (_note[1])); + const timecnt_t rrp1 (_midi_view->view_position_to_model_position (_note[0])); + const timecnt_t rrp2 (_midi_view->view_position_to_model_position (_note[1])); double const x0 = editing_context.sample_to_pixel (rrp1.samples ()); double const x1 = editing_context.sample_to_pixel (rrp2.samples ()); @@ -6820,8 +6820,8 @@ NoteCreateDrag::motion (GdkEvent* event, bool) _note[1] = std::max (aligned_beats, (_note[0].beats () + min_length)); - const timecnt_t rrp1 (_midi_view->relative_position (_note[0])); - const timecnt_t rrp2 (_midi_view->relative_position (_note[1])); + const timecnt_t rrp1 (_midi_view->view_position_to_model_position (_note[0])); + const timecnt_t rrp2 (_midi_view->view_position_to_model_position (_note[1])); double const x0 = editing_context.sample_to_pixel (rrp1.samples ()); double const x1 = editing_context.sample_to_pixel (rrp2.samples ()); diff --git a/gtk2_ardour/midi_view.cc b/gtk2_ardour/midi_view.cc index 80990ab3f6..3f7d3e400d 100644 --- a/gtk2_ardour/midi_view.cc +++ b/gtk2_ardour/midi_view.cc @@ -3036,7 +3036,7 @@ MidiView::snap_pixel_to_time (double x, bool ensure_snap) * correspond to the source start, or a region start. */ timecnt_t -MidiView::relative_position (timepos_t const & p) const +MidiView::view_position_to_model_position (timepos_t const & p) const { if (!_midi_region || _show_source) { return timecnt_t (p, timepos_t (Temporal::Beats())); diff --git a/gtk2_ardour/midi_view.h b/gtk2_ardour/midi_view.h index e25d216e7c..03163e44f0 100644 --- a/gtk2_ardour/midi_view.h +++ b/gtk2_ardour/midi_view.h @@ -289,7 +289,7 @@ class MidiView : public virtual sigc::trackable, public LineMerger * is true. */ - Temporal::timecnt_t relative_position (Temporal::timepos_t const & p) const; + Temporal::timecnt_t view_position_to_model_position (Temporal::timepos_t const & p) const; Temporal::timepos_t source_beats_to_timeline (Temporal::Beats const &) const;