summaryrefslogtreecommitdiff
path: root/gtk2_ardour/region_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/region_view.cc')
-rw-r--r--gtk2_ardour/region_view.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index cc9a5b61ce..9f6ff645ce 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -947,20 +947,19 @@ frameoffset_t
RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) const
{
PublicEditor& editor = trackview.editor();
-
/* x is region relative, convert it to global absolute frames */
framepos_t const session_frame = x + _region->position();
/* try a snap in either direction */
- framepos_t frame = session_frame;
+ MusicFrame frame (session_frame, 0);
editor.snap_to (frame, RoundNearest, false, ensure_snap);
/* if we went off the beginning of the region, snap forwards */
- if (frame < _region->position ()) {
- frame = session_frame;
+ if (frame.frame < _region->position ()) {
+ frame.frame = session_frame;
editor.snap_to (frame, RoundUpAlways, false, ensure_snap);
}
/* back to region relative */
- return frame - _region->position();
+ return frame.frame - _region->position();
}