From: David Robillard <d@drobilla.net>
Date: Tue, 12 Jan 2010 23:28:09 +0000 (+0000)
Subject: Fix crash due to incorrect buffer count.
X-Git-Tag: 3.0-alpha5~2486
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=4e4c75a34a694a91bac75e763f3f83c512d11b36;hp=11bd4eed89f79927f2f7d8cab50a60380cf9e49e;p=ardour.git

Fix crash due to incorrect buffer count.
This will probably hit that assertion as well, but that needs to be fixed at the configuration stage, or with better logic...


git-svn-id: svn://localhost/ardour2/branches/3.0@6480 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 44b0acb50a..fa4b3ce51d 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -452,11 +452,7 @@ Route::process_output_buffers (BufferSet& bufs,
 			assert (bufs.count() == (*i)->input_streams());
 
 			(*i)->run (bufs, start_frame, end_frame, nframes, *i != _processors.back());
-			bufs.set_count (ChanCount::max(bufs.count(), (*i)->output_streams()));
-		}
-
-		if (!_processors.empty()) {
-			bufs.set_count (ChanCount::max (bufs.count(), _processors.back()->output_streams()));
+			bufs.set_count ((*i)->output_streams());
 		}
 	}
 }