X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio_processor.cc;h=6bdac9fe199e47f6b0064f351ac5a63b7cc10d55;hb=1e424e11460812262df89c08c6af521a935760cf;hp=53ad91b9bfa94459de9612596c26b1b12cc58ec5;hpb=28368793415ba934132994d8c10a5e149c1a8d9d;p=ardour.git

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index 53ad91b9bf..6bdac9fe19 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
@@ -36,6 +36,7 @@
 #include "ardour/port_insert.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/io.h"
+#include "ardour/route.h"
 
 #include "i18n.h"
 
@@ -43,17 +44,47 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-IOProcessor::IOProcessor (Session& s, const string& name, Placement p,
-			  int input_min, int input_max,
-			  int output_min, int output_max, 
-			  DataType dtype)
-	: Processor(s, name, p)
-	, _io (new IO(s, name, input_min, input_max, output_min, output_max, dtype))
+/* 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)
+	: Processor(s, proc_name)
+{
+	/* these are true in this constructor whether we actually create the associated
+	   IO objects or not.
+	*/
+
+	_own_input = true;
+	_own_output = true;
+
+	if (with_input) {
+		_input.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Input, dtype));
+	}
+
+	if (with_output) {
+		_output.reset (new IO(s, io_name.empty() ? proc_name : io_name, IO::Output, dtype));
+	}
+}
+
+/* create an IOProcessor that proxies to an existing IO object */
+
+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)
+	, _output (out)
 {
-	_active = false;
-	_sort_key = 0;
-	_gui = 0;
-	_extra_xml = 0;
+	if (in) {
+		_own_input = false;
+	} else {
+		_own_input = true;
+	}
+
+	if (out) {
+		_own_output = false;
+	} else {
+		_own_output = true;
+	}
 }
 
 IOProcessor::~IOProcessor ()
@@ -61,56 +92,138 @@ IOProcessor::~IOProcessor ()
 	notify_callbacks ();
 }
 
+void
+IOProcessor::set_input (boost::shared_ptr<IO> io)
+{
+	/* CALLER MUST HOLD PROCESS LOCK */
+
+	_input = io;
+	_own_input = false;
+}
+
+void
+IOProcessor::set_output (boost::shared_ptr<IO> io)
+{
+	/* CALLER MUST HOLD PROCESS LOCK */
+
+	_output = io;
+	_own_output = false;
+}
+
 XMLNode&
 IOProcessor::state (bool full_state)
 {
-	XMLNode& node = Processor::state(full_state);
-	
-	node.add_child_nocopy (_io->state (full_state));
+	XMLNode& node (Processor::state (full_state));
+
+	if (_own_input) {
+		node.add_property ("own-input", "yes");
+		if (_input) {
+			XMLNode& i (_input->state (full_state));
+			// i.name() = X_("output");
+			node.add_child_nocopy (i);
+		}
+	} else {
+		node.add_property ("own-input", "no");
+		if (_input) {
+			node.add_property ("input", _input->name());
+		}
+	}
+
+	if (_own_output) {
+		node.add_property ("own-output", "yes");
+		if (_output) {
+			XMLNode& o (_output->state (full_state));
+			node.add_child_nocopy (o);
+		}
+	} else {
+		node.add_property ("own-output", "no");
+		if (_output) {
+			node.add_property ("output", _output->name());
+		}
+	}
 
 	return node;
 }
 
 int
-IOProcessor::set_state (const XMLNode& node)
+IOProcessor::set_state (const XMLNode& node, int 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());
+	}
+
+	if ((prop = node.property ("own-output")) != 0) {
+		_own_output = string_is_affirmative (prop->value());
+	}
+
+	/* don't attempt to set state for a proxied IO that we don't own */
 
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
+	const string instr = enum_2_string (IO::Input);
+	const string outstr = enum_2_string (IO::Output);
 
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		if ((*niter)->name() == IO::state_node_name) {
-			io_node = (*niter);
-			break;
-		} else if ((*niter)->name() == "Redirect") {
-			XMLNodeList rlist = (*niter)->children();
-			XMLNodeIterator riter;
-
-			for (riter = rlist.begin(); riter != rlist.end(); ++riter) {
-				if ( (*riter)->name() == IO::state_node_name) {
-					warning << _("Found legacy IO in a redirect") << endmsg;
-					io_node = (*riter);
-					break;
+	if (_own_input) {
+		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+			const XMLProperty* prop;
+			if ((prop = (*niter)->property ("name")) != 0) {
+				if (prop->value() == _name) {
+					if ((prop = (*niter)->property ("direction")) != 0) {
+						if (prop->value() == instr) {
+							io_node = (*niter);
+							break;
+						}
+					}
 				}
 			}
 		}
-	}
 
-	if (io_node) {
-		_io->set_state(*io_node);
+		if (io_node) {
+			_input->set_state(*io_node, version);
+
+			// legacy sessions: use IO name
+			if ((prop = node.property ("name")) == 0) {
+				set_name (_input->name());
+			}
 
-		// legacy sessions: use IO name
-		if ((prop = node.property ("name")) == 0) {
-			set_name(_io->name());
+		} else {
+			/* no input, which is OK */
 		}
 
-	} else {
-		error << _("XML node describing a redirect is missing an IO node") << endmsg;
-		return -1;
+	}
+
+	if (_own_output) {
+		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+			if ((*niter)->name() == "IO") {
+				const XMLProperty* prop;
+				if ((prop = (*niter)->property ("name")) != 0) {
+					if (prop->value() == _name) {
+						if ((prop = (*niter)->property ("direction")) != 0) {
+							if (prop->value() == outstr) {
+								io_node = (*niter);
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (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, which is OK */
+		}
 	}
 
 	return 0;
@@ -119,36 +232,53 @@ IOProcessor::set_state (const XMLNode& node)
 void
 IOProcessor::silence (nframes_t nframes)
 {
-	_io->silence (nframes);
+	if (_own_output && _output) {
+		_output->silence (nframes);
+	}
 }
 
 ChanCount
-IOProcessor::output_streams() const
+IOProcessor::natural_output_streams() const
 {
-	return _io->n_outputs();
+	return _output ? _output->n_ports() : ChanCount::ZERO;
 }
 
 ChanCount
-IOProcessor::input_streams () const
+IOProcessor::natural_input_streams () const
 {
-	return _io->n_inputs();
+	return _input ? _input->n_ports() : ChanCount::ZERO;
 }
 
-ChanCount
-IOProcessor::natural_output_streams() const
+bool
+IOProcessor::set_name (const std::string& name)
 {
-	return _io->n_outputs();
+	bool ret = SessionObject::set_name (name);
+
+	if (ret && _own_input && _input) {
+		ret = _input->set_name (name);
+	}
+
+	if (ret && _own_output && _output) {
+		ret = _output->set_name (name);
+	}
+
+	return ret;
 }
 
-ChanCount
-IOProcessor::natural_input_streams () const
+bool
+IOProcessor::feeds (boost::shared_ptr<Route> other) const
 {
-	return _io->n_inputs();
+	return _output && _output->connected_to (other->input());
 }
 
 void
-IOProcessor::automation_snapshot (nframes_t now, bool force)
+IOProcessor::disconnect ()
 {
-	_io->automation_snapshot(now, force);
-}
+	if (_input) {
+		_input->disconnect (this);
+	}
 
+	if (_output) {
+		_output->disconnect (this);
+	}
+}