X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fprocessor.cc;h=60a23376b6c4c5d15bcd2002dc74899aa349f836;hb=f6b59676b50d11dca38318c55a3ad38655cdb77d;hp=bb004c313d3f97beab2ab1f174c9f2c3fa1c29c2;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index bb004c313d..60a23376b6 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 @@ -50,12 +42,14 @@ #include "ardour/session.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; } + // Always saved as Processor, but may be IOProcessor or Send in legacy sessions const string Processor::state_node_name = "Processor"; @@ -69,6 +63,9 @@ Processor::Processor(Session& session, const string& name) , _display_to_user (true) , _pre_fader (false) , _ui_pointer (0) + , _window_proxy (0) + , _pinmgr_proxy (0) + , _owner (0) { } @@ -76,6 +73,7 @@ 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) @@ -83,6 +81,9 @@ Processor::Processor (const Processor& other) , _display_to_user (true) , _pre_fader (false) , _ui_pointer (0) + , _window_proxy (0) + , _pinmgr_proxy (0) + , _owner (0) { } @@ -123,25 +124,16 @@ 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); + } else { + delete &automation; } } + snprintf (buf, sizeof (buf), "%" PRId64, _user_latency); + node->add_property("user-latency", buf); + return *node; } @@ -160,11 +152,11 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/) set_name (prop->value ()); } - if ((prop = (*i)->property ("id")) != 0) { - _id = prop->value (); - } + set_id (**i); - if ((prop = (*i)->property ("active")) != 0) { + //note: in A2, active state was stored in the Redirect node, not the child IO node + /* + * if ((prop = (*i)->property ("active")) != 0) { bool const a = string_is_affirmative (prop->value ()); if (_active != a) { if (a) { @@ -173,7 +165,8 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/) deactivate (); } } - } + }*/ + } } @@ -187,30 +180,32 @@ Processor::set_state (const XMLNode& node, int version) 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()); - } + XMLProperty const * prop; + XMLProperty const * legacy_active = 0; + 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()); + } - // may not exist for legacy 3.0 sessions - if ((prop = node.property ("id")) != 0) { - _id = 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")) { - XMLProperty *prop; + XMLProperty const * prop; if ((prop = (*niter)->property ("path")) != 0) { old_set_automation_state (*(*niter)); @@ -218,25 +213,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; @@ -253,7 +229,7 @@ Processor::set_state (const XMLNode& node, int version) } } - bool const a = string_is_affirmative (prop->value ()); + bool const a = string_is_affirmative (prop->value ()) && !_session.get_bypass_all_loaded_plugins(); if (_active != a) { if (a) { activate (); @@ -262,6 +238,10 @@ Processor::set_state (const XMLNode& node, int version) } } + if ((prop = node.property ("user-latency")) != 0) { + _user_latency = atoi (prop->value ()); + } + return 0; } @@ -300,3 +280,15 @@ Processor::set_ui (void* p) { _ui_pointer = p; } + +void +Processor::set_owner (SessionObject* o) +{ + _owner = o; +} + +SessionObject* +Processor::owner() const +{ + return _owner; +}