Fix crash due to incorrect buffer count.
authorDavid Robillard <d@drobilla.net>
Tue, 12 Jan 2010 23:28:09 +0000 (23:28 +0000)
committerDavid Robillard <d@drobilla.net>
Tue, 12 Jan 2010 23:28:09 +0000 (23:28 +0000)
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

libs/ardour/route.cc

index 44b0acb50ab3b710c8d25cde480b66ed2d9cf19e..fa4b3ce51d08a72f280bf2acad00e297d96b99bd 100644 (file)
@@ -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());
                }
        }
 }