smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 07:26:32 +01:00
Code Issues Projects Releases Wiki Activity

Better-define behaviour when relayering a playlist with a single zero-length region. Fixes #3144.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7238 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-06-07 12:44:15 +00:00
parent 9510cb20fc
commit e6becb3425
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/ardour/playlist.cc
View file

@ -2432,14 +2432,22 @@ Playlist::relayer ()
/* reset the pending explicit relayer flag for every region, now that we're relayering */
(*i)->set_pending_explicit_relayer (false);
/* find the time divisions that this region covers */
int const start_division = floor ( ((*i)->position() - start) / division_size);
int end_division = floor ( ((*i)->position() + (*i)->length() - start) / division_size );
if (end_division == divisions) {
end_division--;
/* find the time divisions that this region covers; if there are no regions on the list,
division_size will equal 0 and in this case we'll just say that
start_division = end_division = 0.
*/
int start_division = 0;
int end_division = 0;
if (division_size > 0) {
start_division = floor ( ((*i)->position() - start) / division_size);
end_division = floor ( ((*i)->position() + (*i)->length() - start) / division_size );
if (end_division == divisions) {
end_division--;
}
}
assert (end_division < divisions);
assert (divisions == 0 || end_division < divisions);
/* find the lowest layer that this region can go on */
size_t j = layers.size();