projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NoteDrag copy modifier detection is no longer explicit.
[ardour.git]
/
gtk2_ardour
/
region_view.cc
diff --git
a/gtk2_ardour/region_view.cc
b/gtk2_ardour/region_view.cc
index 9f6ff645ce855894872ebd5d1f81b9f15e4f340b..c689a15e7d3c05b7539b5c21084b59f8a073d212 100644
(file)
--- a/
gtk2_ardour/region_view.cc
+++ b/
gtk2_ardour/region_view.cc
@@
-943,7
+943,7
@@
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.
*/
* 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();
RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) const
{
PublicEditor& editor = trackview.editor();
@@
-960,6
+960,6
@@
RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) const
editor.snap_to (frame, RoundUpAlways, false, ensure_snap);
}
editor.snap_to (frame, RoundUpAlways, false, ensure_snap);
}
- /* back to region relative */
- return
frame.frame - _region->position(
);
+ /* back to region relative
, keeping the relevant divisor
*/
+ return
MusicFrame (frame.frame - _region->position(), frame.division
);
}
}