diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-02 15:21:51 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-02 15:21:51 +0000 |
commit | c3e666867cfd44768c9aa605abefde78274ace24 (patch) | |
tree | 547fb2300f0b384387647936c13d6672385aa0e7 /libs/ardour/panner.cc | |
parent | a612857eb6024f75f11094d09def4ccbe621b7b4 (diff) |
reintroduce use of optimized functions for gain into buffer code, and cleanup the way they are declared to avoid depending on Session
git-svn-id: svn://localhost/ardour2/branches/midi@1775 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
-rw-r--r-- | libs/ardour/panner.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index cb4faec148..d3c0dc8d4e 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -41,7 +41,7 @@ #include <ardour/panner.h> #include <ardour/utils.h> -#include <ardour/mix.h> +#include <ardour/runtime_functions.h> #include <ardour/buffer_set.h> #include "i18n.h" @@ -304,7 +304,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain pan = left * gain_coeff; - Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); + mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); } else { @@ -315,7 +315,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain if (pan != 0.0f) { - Session::mix_buffers_with_gain(dst,src,nframes,pan); + mix_buffers_with_gain(dst,src,nframes,pan); /* mark that we wrote into the buffer */ @@ -325,7 +325,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain } else { - Session::mix_buffers_no_gain(dst,src,nframes); + mix_buffers_no_gain(dst,src,nframes); /* mark that we wrote into the buffer */ @@ -354,7 +354,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain pan = right * gain_coeff; - Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); + mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); /* XXX it would be nice to mark the buffer as written to */ @@ -367,14 +367,14 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain if (pan != 0.0f) { - Session::mix_buffers_with_gain(dst,src,nframes,pan); + mix_buffers_with_gain(dst,src,nframes,pan); /* XXX it would be nice to mark the buffer as written to */ } } else { - Session::mix_buffers_no_gain(dst,src,nframes); + mix_buffers_no_gain(dst,src,nframes); /* XXX it would be nice to mark the buffer as written to */ } @@ -666,7 +666,7 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co } pan = left * gain_coeff; - Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); + mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); } else { @@ -676,10 +676,10 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co if ((pan *= gain_coeff) != 1.0f) { if (pan != 0.0f) { - Session::mix_buffers_with_gain(dst,src,nframes,pan); + mix_buffers_with_gain(dst,src,nframes,pan); } } else { - Session::mix_buffers_no_gain(dst,src,nframes); + mix_buffers_no_gain(dst,src,nframes); } #endif #ifdef CAN_INTERP |