- Fixed a buffer size bug when ~/.ardour2 doesn't exist (can't load configuration), if in a hacky way

- Removed useless workbuf/conversion_buffers (same thing), uneeded with libsndfile


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

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/ardour/destructive_filesource.cc b/libs/ardour/destructive_filesource.cc
index 43fafff30a..65ca8dae67 100644
--- a/libs/ardour/destructive_filesource.cc
+++ b/libs/ardour/destructive_filesource.cc
@@ -158,7 +158,7 @@ DestructiveFileSource::clear_capture_marks ()
 }	
 
 jack_nframes_t
-DestructiveFileSource::crossfade (Sample* data, jack_nframes_t cnt, int fade_in, char * workbuf)
+DestructiveFileSource::crossfade (Sample* data, jack_nframes_t cnt, int fade_in)
 {
 	jack_nframes_t xfade = min (xfade_frames, cnt);
 	jack_nframes_t nofade = cnt - xfade;
@@ -272,7 +272,7 @@ DestructiveFileSource::crossfade (Sample* data, jack_nframes_t cnt, int fade_in,
 }
 
 jack_nframes_t
-DestructiveFileSource::write_unlocked (Sample* data, jack_nframes_t cnt, char * workbuf)
+DestructiveFileSource::write_unlocked (Sample* data, jack_nframes_t cnt)
 {
 	jack_nframes_t old_file_pos;
 
@@ -297,7 +297,7 @@ DestructiveFileSource::write_unlocked (Sample* data, jack_nframes_t cnt, char *
 		jack_nframes_t ofilepos = file_pos;
 		
 		// fade in
-		if (crossfade (data, subcnt, 1, workbuf) != subcnt) {
+		if (crossfade (data, subcnt, 1) != subcnt) {
 			return 0;
 		}
 		
@@ -306,7 +306,7 @@ DestructiveFileSource::write_unlocked (Sample* data, jack_nframes_t cnt, char *
 		
 		// fade out
 		subcnt = cnt - subcnt;
-		if (crossfade (tmpdata, subcnt, 0, workbuf) != subcnt) {
+		if (crossfade (tmpdata, subcnt, 0) != subcnt) {
 			return 0;
 		}
 		
@@ -324,7 +324,7 @@ DestructiveFileSource::write_unlocked (Sample* data, jack_nframes_t cnt, char *
 		/* move to the correct location place */
 		file_pos = capture_start_frame;
 		
-		if (crossfade (data, cnt, 1, workbuf) != cnt) {
+		if (crossfade (data, cnt, 1) != cnt) {
 			return 0;
 		}
 		
@@ -337,7 +337,7 @@ DestructiveFileSource::write_unlocked (Sample* data, jack_nframes_t cnt, char *
 		_capture_start = false;
 		_capture_end = false;
 		
-		if (crossfade (data, cnt, 0, workbuf) != cnt) {
+		if (crossfade (data, cnt, 0) != cnt) {
 			return 0;
 		}