diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-16 14:58:33 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-16 14:58:33 +0000 |
| commit | 86f24d20e1616ffaafc97de65db49fd6a91270f8 (patch) | |
| tree | 17f4ac15f4ec6124e82482624f57ed2ceb8f81ca /libs/ardour/panner.cc | |
| parent | 9c8ee46c764f036707f45ebfa8f6696a9a6e56c6 (diff) | |
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
Diffstat (limited to 'libs/ardour/panner.cc')
| -rw-r--r-- | libs/ardour/panner.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; |