X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio_processor.cc;h=877e0422faae5cbc41964ee0cc2aa77c904229bb;hb=ad547e53fc168410b22628a8cb125e8d4da4b293;hp=1408cdcafbee210fa492ad4d049f0e48b0f9eaed;hpb=e488378d42777b436c6a2708d9dff2def51a5271;p=ardour.git

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 1408cdcafb..877e0422fa 100644
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <sstream>
 
-#include <sigc++/bind.h>
 
 #include "pbd/xml++.h"
 #include "pbd/enumwriter.h"
@@ -68,7 +67,7 @@ IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,
 
 /* create an IOProcessor that proxies to an existing IO object */
 
-IOProcessor::IOProcessor (Session& s, boost::shared_ptr<IO> in, boost::shared_ptr<IO> out, 
+IOProcessor::IOProcessor (Session& s, boost::shared_ptr<IO> in, boost::shared_ptr<IO> out,
 			  const string& proc_name, DataType /*dtype*/)
 	: Processor(s, proc_name)
 	, _input (in)
@@ -89,7 +88,6 @@ IOProcessor::IOProcessor (Session& s, boost::shared_ptr<IO> in, boost::shared_pt
 
 IOProcessor::~IOProcessor ()
 {
-	notify_callbacks ();
 }
 
 void
@@ -114,7 +112,7 @@ XMLNode&
 IOProcessor::state (bool full_state)
 {
 	XMLNode& node (Processor::state (full_state));
-	
+
 	if (_own_input) {
 		node.add_property ("own-input", "yes");
 		if (_input) {
@@ -128,12 +126,11 @@ IOProcessor::state (bool full_state)
 			node.add_property ("input", _input->name());
 		}
 	}
-	
+
 	if (_own_output) {
 		node.add_property ("own-output", "yes");
 		if (_output) {
 			XMLNode& o (_output->state (full_state));
-			// o.name() = X_("output");
 			node.add_child_nocopy (o);
 		}
 	} else {
@@ -147,12 +144,16 @@ IOProcessor::state (bool full_state)
 }
 
 int
-IOProcessor::set_state (const XMLNode& node)
+IOProcessor::set_state (const XMLNode& node, int version)
 {
+	if (version < 3000) {
+		return set_state_2X (node, version);
+	}
+
 	const XMLProperty *prop;
 	const XMLNode *io_node = 0;
 
-	Processor::set_state(node);
+	Processor::set_state(node, version);
 
 	if ((prop = node.property ("own-input")) != 0) {
 		_own_input = string_is_affirmative (prop->value());
@@ -166,52 +167,80 @@ IOProcessor::set_state (const XMLNode& node)
 
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
-	
+	const string instr = enum_2_string (IO::Input);
+	const string outstr = enum_2_string (IO::Output);
+
 	if (_own_input) {
 		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-			if ((*niter)->name() == "input") {
-				io_node = (*niter);
-				break;
+			const XMLProperty* prop;
+			if ((prop = (*niter)->property ("name")) != 0) {
+				if (_name == prop->value()) {
+					if ((prop = (*niter)->property ("direction")) != 0) {
+						if (prop->value() == instr) {
+							io_node = (*niter);
+							break;
+						}
+					}
+				}
 			}
 		}
-		
+
 		if (io_node) {
-			_input->set_state(*io_node);
-			
+			_input->set_state(*io_node, version);
+
 			// legacy sessions: use IO name
 			if ((prop = node.property ("name")) == 0) {
 				set_name (_input->name());
 			}
-			
+
 		} else {
-			/* no input */
+			/* no input, which is OK */
 		}
 
 	}
-	
+
 	if (_own_output) {
 		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-			if ((*niter)->name() == "output") {
-				io_node = (*niter);
-				break;
+			if ((*niter)->name() == "IO") {
+				const XMLProperty* prop;
+				if ((prop = (*niter)->property ("name")) != 0) {
+					if (_name == prop->value()) {
+						if ((prop = (*niter)->property ("direction")) != 0) {
+							if (prop->value() == outstr) {
+								io_node = (*niter);
+								break;
+							}
+						}
+					}
+				}
 			}
 		}
-		
+
 		if (io_node) {
-			_output->set_state(*io_node);
-			
+			_output->set_state(*io_node, version);
+
 			// legacy sessions: use IO name
 			if ((prop = node.property ("name")) == 0) {
 				set_name (_output->name());
 			}
 		} else {
-			/* no output */
+			/* no output, which is OK */
 		}
 	}
 
 	return 0;
 }
 
+int
+IOProcessor::set_state_2X (const XMLNode& node, int version)
+{
+	_own_input = _own_output = true;
+
+	Processor::set_state_2X (node, version);
+
+	return 0;
+}
+
 void
 IOProcessor::silence (nframes_t nframes)
 {