new tape tracks ended up with non-destructive sources, fixed

git-svn-id: svn://localhost/ardour2/trunk@1067 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 3 deletions

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 378b62ea04..2ebd27e637 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -805,7 +805,7 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
 			}
 		}
 
-	} else if (xfade) {
+	} else if (xfade < xfade_frames) {
 
 		gain_t in[xfade];
 		gain_t out[xfade];
@@ -817,6 +817,11 @@ SndFileSource::crossfade (Sample* data, nframes_t cnt, int fade_in)
 		for (nframes_t n = 0; n < xfade; ++n) {
 			xfade_buf[n] = (xfade_buf[n] * out[n]) + (fade_data[n] * in[n]);		
 		}
+
+	} else if (xfade) {
+
+		/* long xfade length, has to be computed across several calls */
+
 	}
 
 	if (xfade) {
@@ -865,8 +870,6 @@ SndFileSource::setup_standard_crossfades (nframes_t rate)
 
 	xfade_frames = (nframes_t) floor ((Config->get_destructive_xfade_msecs () / 1000.0) * rate);
 
-	cerr << "based on " << Config->get_destructive_xfade_msecs() << " msecs, xfade_frames = " << xfade_frames << endl;
-
 	if (out_coefficient) {
 		delete [] out_coefficient;
 	}