diff options
author | David Robillard <d@drobilla.net> | 2006-08-02 00:22:16 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-08-02 00:22:16 +0000 |
commit | e51e31dca20d1e636508c61d93a740fdb48eeebd (patch) | |
tree | 647ea489c56feb6c1c7611c6cdb1e025f6f7fbb0 /libs/ardour/mix.cc | |
parent | 0565c75ce8344ecd2e4b42edeabc9cace5f3c091 (diff) |
Merged from trunk R743
git-svn-id: svn://localhost/ardour2/branches/midi@744 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/mix.cc')
-rw-r--r-- | libs/ardour/mix.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc index ab0d1dde59..c6e234d87b 100644 --- a/libs/ardour/mix.cc +++ b/libs/ardour/mix.cc @@ -22,6 +22,7 @@ #include <ardour/types.h> #include <ardour/utils.h> #include <ardour/mix.h> +#include <stdint.h> #if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS) @@ -119,8 +120,9 @@ mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nf float veclib_compute_peak (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current) { - vDSP_maxv(buf, 1, ¤t, nsamples); - return current; + float tmpmax = 0.0f; + vDSP_maxmgv(buf, 1, &tmpmax, nsamples); + return f_max(current, tmpmax); } void |