diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-26 20:54:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-26 20:54:31 +0000 |
| commit | 87726495c30f90554b5204b5385d17274a8fe93e (patch) | |
| tree | d7ecaf0be9b5cbd2afa226cd02cb53a36875d6a2 /libs/ardour/audio_playlist.cc | |
| parent | 45d3ec1437cf661533bc7750c623865def4424df (diff) | |
Merged changes from trunk 1699:1751 into 2.1-staging
git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
| -rw-r--r-- | libs/ardour/audio_playlist.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 501482c840..1a7405dbd3 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -30,6 +30,7 @@ #include <ardour/crossfade.h> #include <ardour/crossfade_compare.h> #include <ardour/session.h> +#include <pbd/enumwriter.h> #include "i18n.h" @@ -381,6 +382,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) } + OverlapType c = top->coverage (bottom->position(), bottom->last_frame()); try { @@ -411,7 +413,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) xfade = boost::shared_ptr<Crossfade> (new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn)); add_crossfade (xfade); - + if (top_region_at (top->last_frame() - 1) == top) { /* only add a fade out if there is no region on top of the end of 'top' (which |