13
0

use framepos_t more clearly for partition operation

git-svn-id: svn://localhost/ardour2/branches/3.0@7425 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-07-16 14:36:05 +00:00
parent 75c9d87051
commit e9ab577177

View File

@ -696,7 +696,7 @@ Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, flo
framepos_t pos = position;
if (times == 1 && auto_partition){
partition((nframes_t) pos - 1, (nframes_t) (pos + region->length()), true);
partition(pos - 1, (pos + region->length()), true);
}
if (itimes >= 1) {
@ -1282,7 +1282,7 @@ Playlist::duplicate (boost::shared_ptr<Region> region, framepos_t position, floa
RegionLock rl (this);
int itimes = (int) floor (times);
nframes_t pos = position + 1;
framepos_t pos = position + 1;
while (itimes--) {
boost::shared_ptr<Region> copy = RegionFactory::create (region);
@ -2257,6 +2257,7 @@ Playlist::set_state (const XMLNode& node, int version)
continue;
}
add_region (region, region->position(), 1.0);
// So that layer_op ordering doesn't get screwed up