summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_playlist_source.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-05-26 17:22:22 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-05-26 17:22:22 +0000
commitd6be900da002cde17570e742bcc48f1588f73dc9 (patch)
tree8996b368649d87610329a54385960ee3c013204f /libs/ardour/audio_playlist_source.cc
parent92ede6153eaf7eaae359a456307f697d04e2fcb7 (diff)
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
Diffstat (limited to 'libs/ardour/audio_playlist_source.cc')
-rw-r--r--libs/ardour/audio_playlist_source.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc
index 882a1710e7..393f90938b 100644
--- a/libs/ardour/audio_playlist_source.cc
+++ b/libs/ardour/audio_playlist_source.cc
@@ -46,11 +46,11 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
-AudioPlaylistSource::AudioPlaylistSource (Session& s, const std::string& name, boost::shared_ptr<AudioPlaylist> p,
+AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr<AudioPlaylist> p,
uint32_t chn, frameoffset_t begin, framecnt_t len, Source::Flag flags)
: Source (s, DataType::AUDIO, name)
, AudioSource (s, name)
- , PlaylistSource (s, name, p, DataType::AUDIO, begin, len, flags)
+ , PlaylistSource (s, orig, name, p, DataType::AUDIO, begin, len, flags)
, _playlist_channel (chn)
{
AudioSource::_length = len;