X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio_processor.cc;h=ddd4ede1d88e27e6518676205011d23d71838f8d;hb=a7431e21db0cfd570eb77cec021e7ef1d1e7115d;hp=6bdac9fe199e47f6b0064f351ac5a63b7cc10d55;hpb=9fa51e19b65153db29ff5865b8e22eb58b99c82b;p=ardour.git diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc index 6bdac9fe19..ddd4ede1d8 100644 --- a/libs/ardour/io_processor.cc +++ b/libs/ardour/io_processor.cc @@ -17,37 +17,33 @@ */ -#include -#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 @@ -58,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)); } } @@ -89,7 +85,6 @@ IOProcessor::IOProcessor (Session& s, boost::shared_ptr in, boost::shared_pt IOProcessor::~IOProcessor () { - notify_callbacks (); } void @@ -115,30 +110,26 @@ IOProcessor::state (bool full_state) { XMLNode& node (Processor::state (full_state)); - if (_own_input) { - node.add_property ("own-input", "yes"); - if (_input) { + node.set_property ("own-input", _own_input); + + if (_input) { + if (_own_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()); + } else { + node.set_property ("input", _input->name ()); } } - if (_own_output) { - node.add_property ("own-output", "yes"); - if (_output) { + node.set_property ("own-output", _own_output); + + if (_output) { + if (_own_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()); + } else { + node.set_property ("output", _output->name ()); } } @@ -148,18 +139,19 @@ IOProcessor::state (bool full_state) int IOProcessor::set_state (const XMLNode& node, int version) { - const XMLProperty *prop; + if (version < 3000) { + return set_state_2X (node, version); + } + + 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 */ @@ -168,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 (prop->value() == _name) { - 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; } } } @@ -197,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 (prop->value() == _name) { - 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; } } } @@ -229,14 +212,32 @@ IOProcessor::set_state (const XMLNode& node, int version) 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) +IOProcessor::silence (framecnt_t nframes, framepos_t /* start_frame */) { if (_own_output && _output) { _output->silence (nframes); } } +void +IOProcessor::increment_port_buffer_offset (pframes_t offset) +{ + if (_own_output && _output) { + _output->increment_port_buffer_offset (offset); + } +} + ChanCount IOProcessor::natural_output_streams() const { @@ -282,3 +283,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.set_property ("ignore-bitslot", true); + state.set_property ("ignore-name", true); + + XMLNode* io_node = state.child (IO::state_node_name.c_str()); + + if (io_node) { + IO::prepare_for_reset (*io_node, name); + } +}