X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio.cc;h=da79301a311e1c42a46be611f782f50f9f202cb0;hb=9a0b1cce075f32768197d001f269a191869cc4e6;hp=93ab043308d1c4b89ddef72a1eae82de25c7e5f0;hpb=1b830d59428f51179094f917a09b0acc16f31c8e;p=ardour.git

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 93ab043308..da79301a31 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -34,17 +34,12 @@
 
 #include "ardour/audioengine.h"
 #include "ardour/buffer.h"
+#include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/io.h"
-#include "ardour/route.h"
 #include "ardour/port.h"
-#include "ardour/audio_port.h"
-#include "ardour/midi_port.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/buffer_set.h"
-#include "ardour/meter.h"
-#include "ardour/amp.h"
 #include "ardour/user_bundle.h"
 
 #include "i18n.h"
@@ -256,8 +251,8 @@ IO::remove_port (boost::shared_ptr<Port> port, void* src)
 	ChanCount after = before;
 	after.set (port->type(), after.get (port->type()) - 1);
 
-	bool const r = PortCountChanging (after); /* EMIT SIGNAL */
-	if (r) {
+	boost::optional<bool> const r = PortCountChanging (after); /* EMIT SIGNAL */
+	if (r.get_value_or (false)) {
 		return -1;
 	}
 
@@ -614,8 +609,6 @@ IO::set_state (const XMLNode& node, int version)
 		return -1;
 	}
 
-	cerr << "IO::set state, connecting legal ? " << connecting_legal << endl;
-
 	if (connecting_legal) {
 
 		if (make_connections (node, version, false)) {