diff options
| author | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-12 23:20:37 +0000 |
| commit | 959a7909c1adca430a63f783fd16687242a7be3d (patch) | |
| tree | b5048c3cc1bbb60bb680472b97ebba6ebb92d72f /libs/ardour/panner.cc | |
| parent | 96ca08b9257e4048294cd1804a65d4ae6cd88814 (diff) | |
Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).
git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
| -rw-r--r-- | libs/ardour/panner.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index 8e41e70687..e12857da93 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -666,10 +666,7 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co } pan = left * gain_coeff; - - for (; n < nframes; ++n) { - dst[n] += src[n] * pan; - } + Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); } else { @@ -679,20 +676,10 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co if ((pan *= gain_coeff) != 1.0f) { if (pan != 0.0f) { - - for (nframes_t n = 0; n < nframes; ++n) { - dst[n] += src[n] * pan; - } - + Session::mix_buffers_with_gain(dst,src,nframes,pan); } - - } else { - - for (nframes_t n = 0; n < nframes; ++n) { - dst[n] += src[n]; - } - + Session::mix_buffers_no_gain(dst,src,nframes); } #endif #ifdef CAN_INTERP |