diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-26 13:56:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-26 13:56:19 +0000 |
| commit | 16c280e40582209e151f54ea7b9d0e9b67048b68 (patch) | |
| tree | 9a6ff5fe770ddfe521b9e207009297aacb74445c /libs/ardour/playlist.cc | |
| parent | f38db9a4e350de376308d89059ba123a16719f1a (diff) | |
turn off relevant fade in/out before creating peakfiles for compound region sources
git-svn-id: svn://localhost/ardour2/branches/3.0@9596 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/playlist.cc')
| -rw-r--r-- | libs/ardour/playlist.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 814278f0e5..3f7eb1852d 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -3071,6 +3071,7 @@ Playlist::combine (const RegionList& r) framepos_t earliest_position = max_framepos; vector<TwoRegions> old_and_new_regions; vector<boost::shared_ptr<Region> > originals; + vector<boost::shared_ptr<Region> > copies; string parent_name; string child_name; uint32_t max_level = 0; @@ -3105,6 +3106,7 @@ Playlist::combine (const RegionList& r) old_and_new_regions.push_back (TwoRegions (original_region,copied_region)); originals.push_back (original_region); + copies.push_back (copied_region); RegionFactory::add_compound_association (original_region, copied_region); @@ -3123,6 +3125,8 @@ Playlist::combine (const RegionList& r) pl->in_partition = false; + pre_combine (copies); + /* now create a new PlaylistSource for each channel in the new playlist */ SourceList sources; @@ -3131,6 +3135,7 @@ Playlist::combine (const RegionList& r) for (uint32_t chn = 0; chn < channels; ++chn) { sources.push_back (SourceFactory::createFromPlaylist (_type, _session, pl, parent_name, chn, 0, extent.second, false, false)); } + /* now a new whole-file region using the list of sources */ @@ -3169,8 +3174,8 @@ Playlist::combine (const RegionList& r) /* do type-specific stuff with the originals and the new compound region */ - - pre_combine (originals, compound_region); + + post_combine (originals, compound_region); /* add the new region at the right location */ |