pulling trunk

[ardour.git] / libs / ardour / destructive_filesource.cc

diff --git a/libs/ardour/destructive_filesource.cc b/libs/ardour/destructive_filesource.cc
index c18fedd982aee4d3b2a3536dad64762c01c1bd05..9a4c2425e9bdd0b6cadb5127de6c2ff1802f6dbb 100644 (file)
--- a/libs/ardour/destructive_filesource.cc
+++ b/libs/ardour/destructive_filesource.cc
@@ -102,7 +102,15 @@ DestructiveFileSource::~DestructiveFileSource()
 void
 DestructiveFileSource::setup_standard_crossfades (jack_nframes_t rate)
 {
-       xfade_frames = (jack_nframes_t) floor ((/*Config->get_destructive_crossfade_msecs()*/ 64 / 1000.0) * rate);
+       xfade_frames = (jack_nframes_t) floor ((Config->get_destructive_xfade_msecs () / 1000.0) * rate);
+
+       if (out_coefficient) {
+               delete [] out_coefficient;
+       }
+
+       if (in_coefficient) {
+               delete [] in_coefficient;
+       }
 
        out_coefficient = new gain_t[xfade_frames];
        in_coefficient = new gain_t[xfade_frames];
@@ -259,10 +267,8 @@ DestructiveFileSource::crossfade (Sample* data, jack_nframes_t cnt, int fade_in,
 jack_nframes_t
 DestructiveFileSource::write (Sample* data, jack_nframes_t cnt, char * workbuf)
 {
-       cerr << _name << ": write " << cnt << " to " << file_pos << " start ? " << _capture_start << " end ? " << _capture_end << endl;
-
        {
-               LockMonitor lm (_lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (_lock);
                
                jack_nframes_t old_file_pos;
 
@@ -273,8 +279,6 @@ DestructiveFileSource::write (Sample* data, jack_nframes_t cnt, char * workbuf)
                        /* move to the correct location place */
                        file_pos = capture_start_frame;
                        
-                       cerr << "First frame of capture will be at " << file_pos << "  and last at: " << file_pos + cnt << endl;
-
                        // split cnt in half
                        jack_nframes_t subcnt = cnt / 2;
                        jack_nframes_t ofilepos = file_pos;
@@ -302,8 +306,6 @@ DestructiveFileSource::write (Sample* data, jack_nframes_t cnt, char * workbuf)
                        /* move to the correct location place */
                        file_pos = capture_start_frame;
                        
-                       cerr << "First frame of capture will be at " << file_pos << endl;
-                       
                        if (crossfade (data, cnt, 1, workbuf) != cnt) {
                                return 0;
                        }
@@ -327,8 +329,6 @@ DestructiveFileSource::write (Sample* data, jack_nframes_t cnt, char * workbuf)
                }
                file_pos += cnt;
                
-               //cerr << this << ' ' << _name << " at end of write, file_pos = " << file_pos << " length = " << ((int) &_length - (int) this) << ' ' << &_length << ' ' << _length << endl;
-
                if (_build_peakfiles) {
                        PeakBuildRecord *pbr = 0;