summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-06-10 13:07:28 +0000
committerCarl Hetherington <carl@carlh.net>2012-06-10 13:07:28 +0000
commitf519f469b27fdd748acf483a4f03994c1fc6ae4c (patch)
tree8cc2b26df1652a20ee3584ba997742308170bb15 /libs/ardour/audio_playlist.cc
parent1dc8d99d78908222545e78f41cff08896f46a529 (diff)
Fix off-by-one in computation of crossfade lengths.
git-svn-id: svn://localhost/ardour2/branches/3.0@12642 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
-rw-r--r--libs/ardour/audio_playlist.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 6653e2f655..c1b6bb6e6d 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -335,7 +335,7 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
} else {
switch (_session.config.get_xfade_model()) {
case FullCrossfade:
- len = bottom->last_frame () - top->first_frame ();
+ len = bottom->last_frame () - top->first_frame () + 1;
top->set_fade_in_is_short (false);
break;
case ShortCrossfade:
@@ -395,7 +395,7 @@ AudioPlaylist::check_crossfades (Evoral::Range<framepos_t> range)
} else {
switch (_session.config.get_xfade_model()) {
case FullCrossfade:
- len = top->last_frame () - bottom->first_frame ();
+ len = top->last_frame () - bottom->first_frame () + 1;
break;
case ShortCrossfade:
len = _session.config.get_short_xfade_seconds() * _session.frame_rate();