ardour/livetrax
13
0
Fork 0
Code

Fixes for region_boundary_cache:

Browse Source 
If no region-snaps are defined, bail out before generating cache.
 Avoid potential overflow at max_samplepos+1
 Snap should continue to work beyond the End marker.
This commit is contained in:
Ben Loftis 2018-02-24 10:30:52 -06:00
parent ceac42cc03
commit f64a39a07f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/editor_ops.cc
View File

@ -708,8 +708,8 @@ void
Editor::build_region_boundary_cache () Editor::build_region_boundary_cache ()
{ {
//ToDo: maybe set a timer so we don't recalutate when lots of changes are coming in /* TODO: maybe set a timer so we don't recalutate when lots of changes are coming in */
//ToDo: maybe somehow defer this until session is fully loaded. /* TODO: maybe somehow defer this until session is fully loaded. */
if (!_region_boundary_cache_dirty) if (!_region_boundary_cache_dirty)
return; return;
@ -741,16 +741,15 @@ Editor::build_region_boundary_cache ()
interesting_points.push_back (SyncPoint); interesting_points.push_back (SyncPoint);
} }
/* if no snap selections are set, boundary cache should be left empty */
if ( interesting_points.empty() ) {
return;
}
TimeAxisView *ontrack = 0; TimeAxisView *ontrack = 0;
TrackViewList tlist; TrackViewList tlist;
//in the past, we used the track selection to limit snap. I think this is not desired. tlist = track_views.filter_to_unique_playlists ();
//or if it is, it needs to be updated every time the track selection changes (so the snapped-cursor can show it)
// if (!selection->tracks.empty()) {
// tlist = selection->tracks.filter_to_unique_playlists ();
// } else {
tlist = track_views.filter_to_unique_playlists ();
// }
if (maybe_first_sample) { if (maybe_first_sample) {
TrackViewList::const_iterator i; TrackViewList::const_iterator i;
@ -763,10 +762,13 @@ Editor::build_region_boundary_cache ()
} }
} }
while (pos < _session->current_end_sample() && !at_end) { std::pair<samplepos_t, samplepos_t> ext = session_gui_extents (false);
samplepos_t session_end = ext.second;
while (pos < session_end && !at_end) {
samplepos_t rpos; samplepos_t rpos;
samplepos_t lpos = max_samplepos; samplepos_t lpos = session_end;
for (vector<RegionPoint>::iterator p = interesting_points.begin(); p != interesting_points.end(); ++p) { for (vector<RegionPoint>::iterator p = interesting_points.begin(); p != interesting_points.end(); ++p) {