Add control-focus notifications from bindable widgets.

[ardour.git] / libs / ardour / processor.cc

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index d571f55688f5e0e283c64ab597704dc87efb9485..fc8f941d71e674721691f69040f0353508936aea 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -24,6 +24,7 @@
 #include <string>
 
 #include "pbd/xml++.h"
+#include "pbd/types_convert.h"
 
 #include "ardour/automatable.h"
 #include "ardour/chan_count.h"
@@ -42,7 +43,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -63,6 +64,8 @@ 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)
 {
 }
@@ -79,6 +82,9 @@ Processor::Processor (const Processor& other)
        , _display_to_user (true)
        , _pre_fader (false)
        , _ui_pointer (0)
+       , _window_proxy (0)
+       , _pinmgr_proxy (0)
+       , _owner (0)
 {
 }
 
@@ -106,12 +112,10 @@ XMLNode&
 Processor::state (bool full_state)
 {
        XMLNode* node = new XMLNode (state_node_name);
-       char buf[64];
 
-       id().print (buf, sizeof (buf));
-       node->add_property("id", buf);
-       node->add_property("name", _name);
-       node->add_property("active", active() ? "yes" : "no");
+       node->set_property("id", id());
+       node->set_property("name", name());
+       node->set_property("active", active());
 
        if (_extra_xml){
                node->add_child_copy (*_extra_xml);
@@ -121,11 +125,12 @@ Processor::state (bool full_state)
                XMLNode& automation = Automatable::get_automation_xml_state();
                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);
+       node->set_property("user-latency", _user_latency);
 
        return *node;
 }
@@ -136,18 +141,20 @@ 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 ());
                        }
-                       
+
                        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) {
@@ -156,7 +163,8 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
                                                deactivate ();
                                        }
                                }
-                       }
+                       }*/
+
                }
        }
 
@@ -170,19 +178,18 @@ Processor::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       const XMLProperty *prop;
-       const XMLProperty *legacy_active = 0;
-       bool leave_name_alone = (node.property ("ignore-name") != 0);
-
-       if (!leave_name_alone) {
+       bool ignore_name;
+       // Only testing for the presence of the property not value
+       if (!node.get_property("ignore-name", ignore_name)) {
+               string name;
                // may not exist for legacy 3.0 sessions
-               if ((prop = node.property ("name")) != 0) {
+               if (node.get_property ("name", name)) {
                        /* 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());
+                       Processor::set_name (name);
                }
-               
+
                set_id (node);
        }
 
@@ -191,12 +198,13 @@ Processor::set_state (const XMLNode& node, int version)
 
        Stateful::save_extra_xml (node);
 
+       XMLProperty const * prop = 0;
+       XMLProperty const * legacy_active = 0;
+
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
                if ((*niter)->name() == X_("Automation")) {
 
-                       XMLProperty *prop;
-
                        if ((prop = (*niter)->property ("path")) != 0) {
                                old_set_automation_state (*(*niter));
                        } else {
@@ -219,7 +227,7 @@ Processor::set_state (const XMLNode& node, int version)
                }
        }
 
-       bool const a = string_is_affirmative (prop->value ());
+       bool const a = string_to<bool> (prop->value ()) && !_session.get_bypass_all_loaded_plugins();
        if (_active != a) {
                if (a) {
                        activate ();
@@ -228,9 +236,7 @@ Processor::set_state (const XMLNode& node, int version)
                }
        }
 
-       if ((prop = node.property ("user-latency")) != 0) {
-               _user_latency = atoi (prop->value ());
-       }
+       node.get_property ("user-latency", _user_latency);
 
        return 0;
 }
@@ -265,12 +271,6 @@ Processor::set_pre_fader (bool p)
        _pre_fader = p;
 }
 
-void
-Processor::set_ui (void* p)
-{
-       _ui_pointer = p;
-}
-
 void
 Processor::set_owner (SessionObject* o)
 {