X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio_processor.cc;h=6a6f09bbe21b5787f11d9a3ef215d0b0d394a330;hb=79621762193a7a56cbb5a966cc8603c1d1c5e17c;hp=8e7cba0ab12eafe100cda5e2c7d3dc8c1e58ad51;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 8e7cba0ab1..6a6f09bbe2 100644
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -17,25 +17,20 @@
 
 */
 
-#include <fstream>
-#include <algorithm>
+#include <list>
 #include <string>
-#include <cerrno>
-#include <unistd.h>
-#include <sstream>
-
 
 #include "pbd/xml++.h"
 #include "pbd/enumwriter.h"
 
-#include "ardour/io_processor.h"
-#include "ardour/session.h"
-#include "ardour/utils.h"
-#include "ardour/send.h"
-#include "ardour/port_insert.h"
-#include "ardour/plugin_insert.h"
+#include "ardour/chan_count.h"
+#include "ardour/data_type.h"
 #include "ardour/io.h"
+#include "ardour/io_processor.h"
+#include "ardour/processor.h"
 #include "ardour/route.h"
+#include "ardour/session_object.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -43,10 +38,12 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class Session; }
+
 /* create an IOProcessor that proxies to a new IO object */
 
 IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,
-			  const string& proc_name, const string io_name, DataType dtype)
+			  const string& proc_name, const string io_name, DataType dtype, bool sendish)
 	: Processor(s, proc_name)
 {
 	/* these are true in this constructor whether we actually create the associated
@@ -57,11 +54,11 @@ IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,
 	_own_output = true;
 
 	if (with_input) {
-		_input.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Input, dtype));
+		_input.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Input, dtype, sendish));
 	}
 
 	if (with_output) {
-		_output.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Output, dtype));
+		_output.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Output, dtype, sendish));
 	}
 }
 
@@ -155,6 +152,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
 
 	Processor::set_state(node, version);
 
+
 	if ((prop = node.property ("own-input")) != 0) {
 		_own_input = string_is_affirmative (prop->value());
 	}
@@ -170,7 +168,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
 	const string instr = enum_2_string (IO::Input);
 	const string outstr = enum_2_string (IO::Output);
 
-	if (_own_input) {
+	if (_own_input && _input) {
 		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 			const XMLProperty* prop;
 			if ((prop = (*niter)->property ("name")) != 0) {
@@ -199,7 +197,7 @@ IOProcessor::set_state (const XMLNode& node, int version)
 
 	}
 
-	if (_own_output) {
+	if (_own_output && _output) {
 		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 			if ((*niter)->name() == "IO") {
 				const XMLProperty* prop;
@@ -302,3 +300,21 @@ IOProcessor::disconnect ()
 		_output->disconnect (this);
 	}
 }
+
+/** Set up the XML description of a send so that we will not
+ *  reset its name or bitslot during ::set_state()
+ *  @param state XML send state.
+ *  @param session Session.
+ */
+void
+IOProcessor::prepare_for_reset (XMLNode &state, const std::string& name)
+{
+	state.add_property ("ignore-bitslot", "1");
+	state.add_property ("ignore-name", "1");
+
+	XMLNode* io_node = state.child (IO::state_node_name.c_str());
+
+	if (io_node) {
+		IO::prepare_for_reset (*io_node, name);
+	}
+}