diff options
| author | David Robillard <d@drobilla.net> | 2007-04-29 17:23:11 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-29 17:23:11 +0000 |
| commit | b3fe7cfc892f7d5978ad14eb81e9305fa9c14d13 (patch) | |
| tree | 4c6617c0397fb1ad3bef1f5fced35fb64b022ccb /libs/ardour/audio_playlist.cc | |
| parent | 490e18d80a22dda07bdf88dd440f7100897822de (diff) | |
Merged with trunk R1761
git-svn-id: svn://localhost/ardour2/branches/midi@1762 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 9dd7064f69..bd30ae0eeb 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" @@ -386,6 +387,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh) } + OverlapType c = top->coverage (bottom->position(), bottom->last_frame()); try { @@ -416,7 +418,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 |