From d6be900da002cde17570e742bcc48f1588f73dc9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 26 May 2011 17:22:22 +0000 Subject: more combine/uncombine fixes including making uncombine push the compound region gain level into the constituents and doing the right thing when we uncombine in a playlist other than the one in which the compound region was created git-svn-id: svn://localhost/ardour2/branches/3.0@9601 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/source_factory.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/source_factory.cc') diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 57f0fdc1ec..afc92c450c 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -347,7 +347,7 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat } boost::shared_ptr -SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr p, const std::string& name, +SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr p, const ID& orig, const std::string& name, uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks) { if (type == DataType::AUDIO) { @@ -362,7 +362,7 @@ SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr< start = 0; } - Source* src = new AudioPlaylistSource (s, name, ap, chn, start, len, Source::Flag (0)); + Source* src = new AudioPlaylistSource (s, orig, name, ap, chn, start, len, Source::Flag (0)); boost::shared_ptr ret (src); if (setup_peakfile (ret, defer_peaks)) { -- cgit v1.2.3