Remove unused variables.

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

diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc
index 1934d6075a258b0874cb99001b4b9161f31ecfbc..3a873a8e5049d9e091ef9cd43cfdc5cefdb6fe08 100644 (file)
--- a/libs/ardour/mix.cc
+++ b/libs/ardour/mix.cc
@@ -30,34 +30,34 @@ using namespace ARDOUR;
 // Debug wrappers
 
 float
-debug_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current) 
+debug_compute_peak (ARDOUR::Sample *buf, pframes_t nsamples, float current)
 {
        if ( ((intptr_t)buf % 16) != 0) {
-               cerr << "compute_peak(): buffer unaligned!" << endl;
+               std::cerr << "compute_peak(): buffer unaligned!" << std::endl;
        }
 
        return x86_sse_compute_peak(buf, nsamples, current);
 }
 
 void
-debug_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain)
+debug_apply_gain_to_buffer (ARDOUR::Sample *buf, pframes_t nframes, float gain)
 {
        if ( ((intptr_t)buf % 16) != 0) {
-               cerr << "apply_gain_to_buffer(): buffer unaligned!" << endl;
+               std::cerr << "apply_gain_to_buffer(): buffer unaligned!" << std::endl;
        }
 
        x86_sse_apply_gain_to_buffer(buf, nframes, gain);
 }
 
 void
-debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain)
+debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, pframes_t nframes, float gain)
 {
        if ( ((intptr_t)dst & 15) != 0) {
-               cerr << "mix_buffers_with_gain(): dst unaligned!" << endl;
+               std::cerr << "mix_buffers_with_gain(): dst unaligned!" << std::endl;
        }
 
        if ( ((intptr_t)dst & 15) != ((intptr_t)src & 15) ) {
-               cerr << "mix_buffers_with_gain(): dst & src don't have the same alignment!" << endl;
+               std::cerr << "mix_buffers_with_gain(): dst & src don't have the same alignment!" << std::endl;
                mix_buffers_with_gain(dst, src, nframes, gain);
        } else {
                x86_sse_mix_buffers_with_gain(dst, src, nframes, gain);
@@ -65,14 +65,14 @@ debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t
 }
 
 void
-debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes)
+debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, pframes_t nframes)
 {
        if ( ((intptr_t)dst & 15) != 0) {
-               cerr << "mix_buffers_no_gain(): dst unaligned!" << endl;
+               std::cerr << "mix_buffers_no_gain(): dst unaligned!" << std::endl;
        }
 
        if ( ((intptr_t)dst & 15) != ((intptr_t)src & 15) ) {
-               cerr << "mix_buffers_no_gain(): dst & src don't have the same alignment!" << endl;
+               std::cerr << "mix_buffers_no_gain(): dst & src don't have the same alignment!" << std::endl;
                mix_buffers_no_gain(dst, src, nframes);
        } else {
                x86_sse_mix_buffers_no_gain(dst, src, nframes);
@@ -83,25 +83,25 @@ debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t n
 
 
 float
-default_compute_peak (const ARDOUR::Sample * buf, nframes_t nsamples, float current) 
+default_compute_peak (const ARDOUR::Sample * buf, pframes_t nsamples, float current)
 {
-       for (nframes_t i = 0; i < nsamples; ++i) {
+       for (pframes_t i = 0; i < nsamples; ++i) {
                current = f_max (current, fabsf (buf[i]));
        }
 
        return current;
-}      
+}
 
 void
-default_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, float *max)
+default_find_peaks (const ARDOUR::Sample * buf, pframes_t nframes, float *min, float *max)
 {
-       nframes_t i;
+       pframes_t i;
        float a, b;
 
        a = *max;
        b = *min;
 
-       for (i = 0; i < nframes; i++) 
+       for (i = 0; i < nframes; i++)
        {
                a = fmax (buf[i], a);
                b = fmin (buf[i], b);
@@ -112,24 +112,24 @@ default_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, f
 }
 
 void
-default_apply_gain_to_buffer (ARDOUR::Sample * buf, nframes_t nframes, float gain)
-{              
-       for (nframes_t i=0; i<nframes; i++)
+default_apply_gain_to_buffer (ARDOUR::Sample * buf, pframes_t nframes, float gain)
+{
+       for (pframes_t i=0; i<nframes; i++)
                buf[i] *= gain;
 }
 
 void
-default_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes, float gain)
+default_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes, float gain)
 {
-       for (nframes_t i = 0; i < nframes; i++) {
+       for (pframes_t i = 0; i < nframes; i++) {
                dst[i] += src[i] * gain;
        }
 }
 
 void
-default_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes)
+default_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes)
 {
-       for (nframes_t i=0; i < nframes; i++) {
+       for (pframes_t i=0; i < nframes; i++) {
                dst[i] += src[i];
        }
 }
@@ -138,7 +138,7 @@ default_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, n
 #include <Accelerate/Accelerate.h>
 
 float
-veclib_compute_peak (const ARDOUR::Sample * buf, nframes_t nsamples, float current)
+veclib_compute_peak (const ARDOUR::Sample * buf, pframes_t nsamples, float current)
 {
        float tmpmax = 0.0f;
        vDSP_maxmgv(buf, 1, &tmpmax, nsamples);
@@ -146,26 +146,26 @@ veclib_compute_peak (const ARDOUR::Sample * buf, nframes_t nsamples, float curre
 }
 
 void
-veclib_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, float *max)
+veclib_find_peaks (const ARDOUR::Sample * buf, pframes_t nframes, float *min, float *max)
 {
        vDSP_maxv (const_cast<ARDOUR::Sample*>(buf), 1, max, nframes);
        vDSP_minv (const_cast<ARDOUR::Sample*>(buf), 1, min, nframes);
 }
 
 void
-veclib_apply_gain_to_buffer (ARDOUR::Sample * buf, nframes_t nframes, float gain)
+veclib_apply_gain_to_buffer (ARDOUR::Sample * buf, pframes_t nframes, float gain)
 {
        vDSP_vsmul(buf, 1, &gain, buf, 1, nframes);
 }
 
 void
-veclib_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes, float gain)
+veclib_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes, float gain)
 {
        vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
 }
 
 void
-veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes)
+veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes)
 {
        // It seems that a vector mult only operation does not exist...
        float gain = 1.0f;
@@ -173,5 +173,5 @@ veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nf
 }
 
 #endif
-               
+