X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fprocessor.cc;h=d571f55688f5e0e283c64ab597704dc87efb9485;hb=06cc5e5240cc2bfeb4e22c742a5705566bd11dbe;hp=66d45a4174925be0e0f85e7c83c0bc1b54ac23a7;hpb=ad1f38c0a232ff31e4221a3e7fad75e0b785ae2e;p=ardour.git diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index 66d45a4174..d571f55688 100644 --- a/libs/ardour/processor.cc +++ b/libs/ardour/processor.cc @@ -23,26 +23,18 @@ #include - -#include "pbd/failed_constructor.h" -#include "pbd/enumwriter.h" #include "pbd/xml++.h" +#include "ardour/automatable.h" +#include "ardour/chan_count.h" #include "ardour/processor.h" -#include "ardour/plugin.h" -#include "ardour/port.h" -#include "ardour/route.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/buffer_set.h" -#include "ardour/send.h" -#include "ardour/port_insert.h" -#include "ardour/plugin_insert.h" - -#ifdef VST_SUPPORT -#include "ardour/vst_plugin.h" +#include "ardour/types.h" + +#ifdef WINDOWS_VST_SUPPORT +#include "ardour/windows_vst_plugin.h" #endif -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT #include "ardour/audio_unit.h" #endif @@ -56,6 +48,8 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +namespace ARDOUR { class Session; } + // Always saved as Processor, but may be IOProcessor or Send in legacy sessions const string Processor::state_node_name = "Processor"; @@ -68,7 +62,8 @@ Processor::Processor(Session& session, const string& name) , _configured(false) , _display_to_user (true) , _pre_fader (false) - , _ui_pointer (0) + , _ui_pointer (0) + , _owner (0) { } @@ -76,13 +71,14 @@ Processor::Processor (const Processor& other) : Evoral::ControlSet (other) , SessionObject (other.session(), other.name()) , Automatable (other.session()) + , Latent (other) , _pending_active(other._pending_active) , _active(other._active) , _next_ab_is_active(false) , _configured(false) , _display_to_user (true) , _pre_fader (false) - , _ui_pointer (0) + , _ui_pointer (0) { } @@ -123,25 +119,14 @@ Processor::state (bool full_state) if (full_state) { XMLNode& automation = Automatable::get_automation_xml_state(); - if (!automation.children().empty() - || !automation.properties().empty() - || !_visible_controls.empty()) { - - stringstream sstr; - for (set::iterator x = _visible_controls.begin(); - x != _visible_controls.end(); ++x) { - - if (x != _visible_controls.begin()) { - sstr << ' '; - } - sstr << (*x).id(); - } - - automation.add_property ("visible", sstr.str()); + if (!automation.children().empty() || !automation.properties().empty()) { node->add_child_nocopy (automation); } } + snprintf (buf, sizeof (buf), "%" PRId64, _user_latency); + node->add_property("user-latency", buf); + return *node; } @@ -151,18 +136,16 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/) XMLProperty const * prop; XMLNodeList children = node.children (); - + for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == X_("IO")) { - + if ((prop = (*i)->property ("name")) != 0) { set_name (prop->value ()); } - - if ((prop = (*i)->property ("id")) != 0) { - _id = prop->value (); - } + + set_id (**i); if ((prop = (*i)->property ("active")) != 0) { bool const a = string_is_affirmative (prop->value ()); @@ -186,26 +169,28 @@ Processor::set_state (const XMLNode& node, int version) if (version < 3000) { return set_state_2X (node, version); } - + const XMLProperty *prop; const XMLProperty *legacy_active = 0; - - // may not exist for legacy 3.0 sessions - if ((prop = node.property ("name")) != 0) { - /* don't let derived classes have a crack at set_name, - as some (like Send) will screw with the one we suggest. - */ - Processor::set_name (prop->value()); - } - - // may not exist for legacy 3.0 sessions - if ((prop = node.property ("id")) != 0) { - _id = prop->value(); + bool leave_name_alone = (node.property ("ignore-name") != 0); + + if (!leave_name_alone) { + // may not exist for legacy 3.0 sessions + if ((prop = node.property ("name")) != 0) { + /* don't let derived classes have a crack at set_name, + as some (like Send) will screw with the one we suggest. + */ + Processor::set_name (prop->value()); + } + + set_id (node); } XMLNodeList nlist = node.children(); XMLNodeIterator niter; + Stateful::save_extra_xml (node); + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { if ((*niter)->name() == X_("Automation")) { @@ -218,25 +203,6 @@ Processor::set_state (const XMLNode& node, int version) set_automation_xml_state (*(*niter), Evoral::Parameter(PluginAutomation)); } - if ((prop = (*niter)->property ("visible")) != 0) { - uint32_t what; - stringstream sstr; - - _visible_controls.clear (); - - sstr << prop->value(); - while (1) { - sstr >> what; - if (sstr.fail()) { - break; - } - // FIXME: other automation types? - mark_automation_visible (Evoral::Parameter(PluginAutomation, 0, what), true); - } - } - - } else if ((*niter)->name() == "Extra") { - _extra_xml = new XMLNode (*(*niter)); } else if ((*niter)->name() == "Redirect") { if ( !(legacy_active = (*niter)->property("active"))) { error << string_compose(_("No %1 property flag in element %2"), "active", (*niter)->name()) << endl; @@ -262,10 +228,14 @@ Processor::set_state (const XMLNode& node, int version) } } + if ((prop = node.property ("user-latency")) != 0) { + _user_latency = atoi (prop->value ()); + } + return 0; } -/** Caller must hold process lock */ +/** @pre Caller must hold process lock */ bool Processor::configure_io (ChanCount in, ChanCount out) { @@ -284,7 +254,7 @@ Processor::configure_io (ChanCount in, ChanCount out) } void -Processor::set_display_to_user (bool yn) +Processor::set_display_to_user (bool yn) { _display_to_user = yn; } @@ -298,5 +268,17 @@ Processor::set_pre_fader (bool p) void Processor::set_ui (void* p) { - _ui_pointer = p; + _ui_pointer = p; +} + +void +Processor::set_owner (SessionObject* o) +{ + _owner = o; +} + +SessionObject* +Processor::owner() const +{ + return _owner; }