* refactor Session::follow_slave to be easier to read and understand

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

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 8e68b315877e0b87e0499db9f6bcc5e8113a947e..b8366e0ac038a70e1d92e8fed326b57ed7a93cde 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -97,9 +97,7 @@ AudioSource::~AudioSource ()
                ::close (peakfile);
        }
 
-       if (peak_leftovers) {
-               delete [] peak_leftovers;
-       }
+       delete [] peak_leftovers;
 }
 
 XMLNode&
@@ -573,13 +571,8 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, nframes_t s
                close (_peakfile);
        }
 
-       if (staging) {
-               delete [] staging;
-       } 
-
-       if (raw_staging) {
-               delete [] raw_staging;
-       }
+       delete [] staging;
+       delete [] raw_staging;
 
 #ifdef DEBUG_READ_PEAKS
        cerr << "RP DONE\n";
@@ -656,9 +649,7 @@ AudioSource::build_peaks_from_scratch ()
                unlink (peakpath.c_str());
        }
 
-       if (buf) {
-               delete [] buf;
-       }
+       delete [] buf;
 
        return ret;
 }
@@ -862,9 +853,8 @@ AudioSource::compute_and_write_peaks (Sample* buf, nframes_t first_frame, nframe
 
   out:
        delete [] peakbuf;
-       if (buf2) {
-               delete [] buf2;
-       }
+       delete [] buf2;
+
        return ret;
 }