diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-01 23:26:14 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-01 23:26:14 +0000 |
| commit | 0c7b7216efc71e9b3851f1b43f2191a99619ff25 (patch) | |
| tree | b957a47485c09a107bcce162d1bcf25caa81800a /libs/ardour/panner.cc | |
| parent | cdaec2d09e86e28d38d5d472a90032984b0bfcb0 (diff) | |
initial fixes to get build to work without new JACK MIDI, and to get it running with an older session, at least somewhat
git-svn-id: svn://localhost/ardour2/branches/midi@1773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
| -rw-r--r-- | libs/ardour/panner.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index e12857da93..cb4faec148 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -1386,9 +1386,6 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes return; } - - // More than 1 output, we should have 1 panner for each input - assert(size() == inbufs.count().get(DataType::AUDIO)); /* the terrible silence ... */ for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) { @@ -1396,7 +1393,8 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes } BufferSet::audio_iterator i = inbufs.audio_begin(); - for (iterator pan = begin(); pan != end(); ++pan, ++i) { + + for (iterator pan = begin(); pan != end() && i != inbufs.audio_end(); ++pan, ++i) { (*pan)->distribute (*i, outbufs, gain_coeff, nframes); } } |