allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Prevent snap_frame_to_frame returning -ve offset from the region start (fixes #3925).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9396 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2011-04-20 23:48:39 +00:00
parent 80e9eb09dd
commit e90e1cc771
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk2_ardour/midi_region_view.cc
View File

@@ -2238,14 +2238,30 @@ MidiRegionView::snap_pixel_to_frame(double x)
return frame - _region->position(); // convert back to region relative
}
framepos_t
MidiRegionView::snap_frame_to_frame(framepos_t x)
/** Snap a frame offset within our region using the current snap settings.
* @param x Frame offset from this region's position.
* @return Snapped frame offset from this region's position.
*/
frameoffset_t
MidiRegionView::snap_frame_to_frame (frameoffset_t x)
{
PublicEditor& editor = trackview.editor();
// x is region relative, convert it to global absolute frames
framepos_t frame = x + _region->position();
editor.snap_to(frame);
return frame - _region->position(); // convert back to region relative
/* 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;
editor.snap_to (frame, 0);
/* if we went off the beginning of the region, snap forwards */
if (frame < _region->position ()) {
frame = session_frame;
editor.snap_to (frame, 1);
}
/* back to region relative */
return frame - _region->position();
}
double

6
gtk2_ardour/midi_region_view.h
View File

@@ -250,11 +250,7 @@ class MidiRegionView : public RegionView
*/
framepos_t snap_pixel_to_frame(double x);
/** Snap a region relative frame coordinate to frame units.
* @param x a pixel coordinate relative to region start
* @return the snapped framepos_t coordinate relative to region start
*/
framepos_t snap_frame_to_frame(framepos_t x);
ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t);
/** Convert a timestamp in beats to frames (both relative to region start) */
framepos_t beats_to_frames(double beats) const;