From bb457bb960c5bd7ed538f9d31477293415739f68 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 10 Jan 2008 21:20:59 +0000 Subject: Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/io.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libs/ardour/io.cc') diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 89c342e9cf..7a2ae2aad9 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -307,12 +307,12 @@ void IO::collect_input (BufferSet& outs, nframes_t nframes, nframes_t offset) { assert(outs.available() >= n_inputs()); - - outs.set_count(n_inputs()); - if (outs.count() == ChanCount::ZERO) + if (n_inputs() == ChanCount::ZERO) return; + outs.set_count(n_inputs()); + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { BufferSet::iterator o = outs.begin(*t); @@ -2567,3 +2567,4 @@ IO::UserBundleInfo::UserBundleInfo (IO* io, boost::shared_ptr b) sigc::mem_fun (*io, &IO::bundle_ports_have_changed) ); } + -- cgit v1.2.3