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/ardour | |
| 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/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioplaylist.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index a8426b5f51..a0da358777 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -106,7 +106,8 @@ public: void remove_dependents (boost::shared_ptr<Region> region); void copy_dependents (const std::vector<TwoRegions>&, boost::shared_ptr<Playlist>); - void pre_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); + void pre_combine (std::vector<boost::shared_ptr<Region> >&); + void post_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); private: diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 69f4963359..7635d004bc 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -390,7 +390,13 @@ public: framepos_t start; }; - virtual void pre_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {} + /* this is called before we create a new compound region */ + virtual void pre_combine (std::vector<boost::shared_ptr<Region> >&) {} + /* this is called before we create a new compound region */ + virtual void post_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {} + /* this is called before we remove a compound region and replace it + with its constituent regions + */ virtual void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {} }; |