diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-29 14:38:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-29 14:38:25 +0000 |
| commit | 489d2ba1a76c64a935808591571ca63a053172c8 (patch) | |
| tree | 8cd12e3f53b7ffaa15271650b3b7c0b0253e1b86 /libs/ardour/audio_playlist_source.cc | |
| parent | c3821a78162fe6d89455ab5ed4e925bafec2a845 (diff) | |
don't always rebuild peakfiles for compound regions
git-svn-id: svn://localhost/ardour2/branches/3.0@9627 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist_source.cc')
| -rw-r--r-- | libs/ardour/audio_playlist_source.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc index f225db9c45..eb71dc449b 100644 --- a/libs/ardour/audio_playlist_source.cc +++ b/libs/ardour/audio_playlist_source.cc @@ -49,8 +49,8 @@ using namespace PBD; 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, orig, name, p, DataType::AUDIO, begin, len, flags) + , AudioSource (s, name) , _playlist_channel (chn) { AudioSource::_length = len; @@ -59,8 +59,8 @@ AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std: AudioPlaylistSource::AudioPlaylistSource (Session& s, const XMLNode& node) : Source (s, node) - , AudioSource (s, node) , PlaylistSource (s, node) + , AudioSource (s, node) { /* PlaylistSources are never writable, renameable, removable or destructive */ _flags = Flag (_flags & ~(Writable|CanRename|Removable|RemovableIfEmpty|RemoveAtDestroy|Destructive)); @@ -93,7 +93,6 @@ AudioPlaylistSource::get_state () return node; } - int AudioPlaylistSource::set_state (const XMLNode& node, int version) @@ -106,8 +105,8 @@ AudioPlaylistSource::set_state (const XMLNode& node, int version, bool with_desc { if (with_descendants) { if (Source::set_state (node, version) || - AudioSource::set_state (node, version) || - PlaylistSource::set_state (node, version)) { + PlaylistSource::set_state (node, version) || + AudioSource::set_state (node, version)) { return -1; } } @@ -226,3 +225,4 @@ AudioPlaylistSource::peak_path (string /*audio_path_IGNORED*/) return _peak_path; } + |