From 86f24d20e1616ffaafc97de65db49fd6a91270f8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 16 Jun 2009 14:58:33 +0000 Subject: first pass (ok, third really) at internal send+return - audio routing inside ardour without JACK. lots still to do, but at least the obvious works git-svn-id: svn://localhost/ardour2/branches/3.0@5202 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/panner.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/panner.cc') diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index bd6d05a0b4..be72f65593 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -1379,7 +1379,7 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes if (inbufs.count().n_audio() > 0) { BufferSet::audio_iterator i = inbufs.audio_begin(); for (++i; i != inbufs.audio_end(); ++i) { - dst.accumulate_from(*i, nframes); + dst.merge_from(*i, nframes); } } @@ -1456,7 +1456,7 @@ Panner::run (BufferSet& inbufs, BufferSet& outbufs, sframes_t start_frame, sfram // accumulate starting with the second BufferSet::audio_iterator i = inbufs.audio_begin(); for (++i; i != inbufs.audio_end(); ++i) { - dst.accumulate_from(*i, nframes); + dst.merge_from(*i, nframes); } return; -- cgit v1.2.3