diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-16 14:36:05 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-07-16 14:36:05 +0000 |
| commit | e9ab577177db3c37719331c00900e48d4dfbf158 (patch) | |
| tree | 0d827aac19c86bfa240d62408316f45dae53dd37 /libs | |
| parent | 75c9d8705155d522eb03dd7ba7138c997995cc62 (diff) | |
use framepos_t more clearly for partition operation
git-svn-id: svn://localhost/ardour2/branches/3.0@7425 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/playlist.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 20d771c692..5257491815 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -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 |