MIDIClock_SlaveTest: first working testcase

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

diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc
index 726d3754530fc0c765806424a7a79feed968f0c8..c058dec06b10e45d73f7ff590be5610ce5f429c6 100644 (file)
--- a/libs/ardour/mix.cc
+++ b/libs/ardour/mix.cc
@@ -18,9 +18,10 @@
 */
 
 #include <cmath>
-#include <ardour/types.h>
-#include <ardour/utils.h>
-#include <ardour/mix.h>
+#include "ardour/types.h"
+#include "ardour/utils.h"
+#include "ardour/mix.h"
+#include "ardour/runtime_functions.h"
 #include <stdint.h>
 
 using namespace ARDOUR;
@@ -29,10 +30,10 @@ using namespace ARDOUR;
 // Debug wrappers
 
 float
-debug_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current) 
+debug_compute_peak (ARDOUR::Sample *buf, nframes_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);
@@ -42,7 +43,7 @@ void
 debug_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_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);
@@ -52,11 +53,11 @@ void
 debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_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);
@@ -67,11 +68,11 @@ void
 debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_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);
@@ -82,14 +83,14 @@ 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, nframes_t nsamples, float current)
 {
        for (nframes_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)
@@ -100,7 +101,7 @@ default_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, f
        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,7 +113,7 @@ 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++)
                buf[i] *= gain;
 }
@@ -172,5 +173,5 @@ veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nf
 }
 
 #endif
-               
+