Merge branch 'master' into windows

[ardour.git] / libs / ardour / route.cc

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 671a00319d95122d850ed75242ac40773ccac813..f53acebe14ccb01cbe5a73a5c17151e3ea3e4814 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -543,11 +543,10 @@ Route::process_output_buffers (BufferSet& bufs,
                        if (bufs.count() != (*i)->input_streams()) {
                                DEBUG_TRACE (
                                        DEBUG::Processors, string_compose (
-                                               "%1 bufs = %2 input for %3 = %4\n",
+                                               "input port mismatch %1 bufs = %2 input for %3 = %4\n",
                                                _name, bufs.count(), (*i)->name(), (*i)->input_streams()
                                                )
                                        );
-                               continue;
                        }
                }
 #endif
@@ -1656,7 +1655,8 @@ Route::try_configure_processors_unlocked (ChanCount in, ProcessorStreams* err)
 
                if (boost::dynamic_pointer_cast<UnknownProcessor> (*p)) {
                        DEBUG_TRACE (DEBUG::Processors, "--- CONFIGURE ABORTED due to unknown processor.\n");
-                       break;
+                       DEBUG_TRACE (DEBUG::Processors, "}\n");
+                       return list<pair<ChanCount, ChanCount> > ();
                }
 
                if ((*p)->can_support_io_configuration(in, out)) {