diff options
| author | David Robillard <d@drobilla.net> | 2007-03-18 06:07:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-03-18 06:07:08 +0000 |
| commit | 99904735e066804358f1d0bd138a84f1e9ecda91 (patch) | |
| tree | 71a924cf1660b5b00231275bd481bbd27094dd9b /libs/ardour/ardour/mix.h | |
| parent | eb270e70a12c410cdd98585ad25bb6d8e384a4f5 (diff) | |
Merged with trunk R1612.
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/mix.h')
| -rw-r--r-- | libs/ardour/ardour/mix.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libs/ardour/ardour/mix.h b/libs/ardour/ardour/mix.h index 653b61cb95..5555f5437e 100644 --- a/libs/ardour/ardour/mix.h +++ b/libs/ardour/ardour/mix.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_mix_h__ #define __ardour_mix_h__ @@ -28,7 +27,7 @@ extern "C" { /* SSE functions */ - float x86_sse_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); + float x86_sse_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); void x86_sse_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain); @@ -37,9 +36,11 @@ extern "C" { void x86_sse_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes); } +void x86_sse_find_peaks (ARDOUR::Sample *buf, nframes_t nsamples, float *min, float *max); + /* debug wrappers for SSE functions */ -float debug_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); +float debug_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); void debug_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain); @@ -53,6 +54,8 @@ void debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nfra float veclib_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); +void veclib_find_peaks (ARDOUR::Sample *buf, nframes_t nsamples, float *min, float *max); + void veclib_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain); void veclib_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain); @@ -63,12 +66,14 @@ void veclib_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src /* non-optimized functions */ -float compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); +float compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current); + +void find_peaks (ARDOUR::Sample *buf, nframes_t nsamples, float *min, float *max); -void apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain); +void apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain); -void mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain); +void mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain); -void mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes); +void mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes); #endif /* __ardour_mix_h__ */ |