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:
parent
75c9d87051
commit
e9ab577177
|
@ -696,7 +696,7 @@ Playlist::add_region (boost::shared_ptr<Region> region, framepos_t position, flo
|
||||||
framepos_t pos = position;
|
framepos_t pos = position;
|
||||||
|
|
||||||
if (times == 1 && auto_partition){
|
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) {
|
if (itimes >= 1) {
|
||||||
|
@ -1282,7 +1282,7 @@ Playlist::duplicate (boost::shared_ptr<Region> region, framepos_t position, floa
|
||||||
|
|
||||||
RegionLock rl (this);
|
RegionLock rl (this);
|
||||||
int itimes = (int) floor (times);
|
int itimes = (int) floor (times);
|
||||||
nframes_t pos = position + 1;
|
framepos_t pos = position + 1;
|
||||||
|
|
||||||
while (itimes--) {
|
while (itimes--) {
|
||||||
boost::shared_ptr<Region> copy = RegionFactory::create (region);
|
boost::shared_ptr<Region> copy = RegionFactory::create (region);
|
||||||
|
@ -2257,6 +2257,7 @@ Playlist::set_state (const XMLNode& node, int version)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
add_region (region, region->position(), 1.0);
|
add_region (region, region->position(), 1.0);
|
||||||
|
|
||||||
// So that layer_op ordering doesn't get screwed up
|
// So that layer_op ordering doesn't get screwed up
|
||||||
|
|
Loading…
Reference in New Issue
Block a user