X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio_processor.cc;h=e87b5a59127c2b3651a966269f516ebf971c230a;hb=5fa05b403ca21a6573d07b921dc14f0769dc9fc7;hp=8cad0ba6cb8c467410d9ba0387552152b0e465f8;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc index 8cad0ba6cb..e87b5a5912 100644 --- a/libs/ardour/io_processor.cc +++ b/libs/ardour/io_processor.cc @@ -17,36 +17,33 @@ */ -#include -#include +#include #include -#include -#include -#include - #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" +#include "pbd/i18n.h" 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)); } } @@ -109,34 +106,30 @@ IOProcessor::set_output (boost::shared_ptr io) } XMLNode& -IOProcessor::state (bool full_state) +IOProcessor::state () { - XMLNode& node (Processor::state (full_state)); + XMLNode& node (Processor::state ()); - if (_own_input) { - node.add_property ("own-input", "yes"); - if (_input) { - XMLNode& i (_input->state (full_state)); + node.set_property ("own-input", _own_input); + + if (_input) { + if (_own_input) { + XMLNode& i (_input->get_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()); + } else { + node.set_property ("input", _input->name ()); } } - if (_own_output) { - node.add_property ("own-output", "yes"); - if (_output) { - XMLNode& o (_output->state (full_state)); + node.set_property ("own-output", _own_output); + + if (_output) { + if (_own_output) { + XMLNode& o (_output->get_state ()); node.add_child_nocopy (o); - } - } else { - node.add_property ("own-output", "no"); - if (_output) { - node.add_property ("output", _output->name()); + } else { + node.set_property ("output", _output->name ()); } } @@ -150,18 +143,15 @@ IOProcessor::set_state (const XMLNode& node, int version) return set_state_2X (node, version); } - const XMLProperty *prop; + XMLProperty const * prop; const XMLNode *io_node = 0; Processor::set_state(node, version); - if ((prop = node.property ("own-input")) != 0) { - _own_input = string_is_affirmative (prop->value()); - } + bool ignore_name = node.property ("ignore-name"); - if ((prop = node.property ("own-output")) != 0) { - _own_output = string_is_affirmative (prop->value()); - } + node.get_property ("own-input", _own_input); + node.get_property ("own-output", _own_output); /* don't attempt to set state for a proxied IO that we don't own */ @@ -170,17 +160,13 @@ 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) { + std::string str; + if (_own_input && _input) { for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - 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 ((*niter)->get_property ("name", str) && (_name == str || ignore_name)) { + if ((*niter)->get_property ("direction", str) && str == instr) { + io_node = (*niter); + break; } } } @@ -199,18 +185,13 @@ 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; - 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 ((*niter)->get_property ("name", str) && (_name == str || ignore_name)) { + if ((*niter)->get_property ("direction", str) && str == outstr) { + io_node = (*niter); + break; } } } @@ -242,7 +223,7 @@ IOProcessor::set_state_2X (const XMLNode& node, int version) } void -IOProcessor::silence (framecnt_t nframes) +IOProcessor::silence (samplecnt_t nframes, samplepos_t /* start_sample */) { if (_own_output && _output) { _output->silence (nframes); @@ -294,3 +275,24 @@ 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.set_property ("ignore-bitslot", true); + state.set_property ("ignore-name", true); + + XMLNodeList nlist = state.children(); + XMLNodeIterator niter; + + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + if ((*niter)->name() == IO::state_node_name.c_str()) { + IO::prepare_for_reset (**niter, name); + } + } +}