Add option to disable blinking alert buttons.

[ardour.git] / gtk2_ardour / region_view.cc

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index cc9a5b61ceea54751722269e08333d82232db1a5..c689a15e7d3c05b7539b5c21084b59f8a073d212 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -943,24 +943,23 @@ RegionView::move_contents (frameoffset_t distance)
  *  Used when inverting snap mode logic with key modifiers, or snap distance calculation.
  *  @return Snapped frame offset from this region's position.
  */
-frameoffset_t
+MusicFrame
 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();
+       /* back to region relative, keeping the relevant divisor */
+       return MusicFrame (frame.frame - _region->position(), frame.division);
 }