Various updates and fixes for Latency Compensation

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index f13edb516532c7bfa84cf79d2422e8d495884dee..06a7c9676f94435f1e2f9f3ce8a7ef09c49a752e 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -24,9 +24,11 @@
 #include <string>
 
 #include "pbd/xml++.h"
+#include "pbd/types_convert.h"
 
 #include "ardour/automatable.h"
 #include "ardour/chan_count.h"
+#include "ardour/debug.h"
 #include "ardour/processor.h"
 #include "ardour/types.h"
 
@@ -42,7 +44,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -66,6 +68,8 @@ Processor::Processor(Session& session, const string& name)
        , _window_proxy (0)
        , _pinmgr_proxy (0)
        , _owner (0)
+       , _input_latency (0)
+       , _output_latency (0)
 {
 }
 
@@ -84,9 +88,15 @@ Processor::Processor (const Processor& other)
        , _window_proxy (0)
        , _pinmgr_proxy (0)
        , _owner (0)
+       , _input_latency (0)
 {
 }
 
+Processor::~Processor ()
+{
+       DEBUG_TRACE (DEBUG::Destruction, string_compose ("processor %1 destructor\n", _name));
+}
+
 XMLNode&
 Processor::get_state (void)
 {
@@ -111,12 +121,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);
@@ -131,8 +139,7 @@ Processor::state (bool full_state)
                }
        }
 
-       snprintf (buf, sizeof (buf), "%" PRId64, _user_latency);
-       node->add_property("user-latency", buf);
+       node->set_property("user-latency", _user_latency);
 
        return *node;
 }
@@ -180,17 +187,16 @@ Processor::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       XMLProperty const * prop;
-       XMLProperty const * 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);
@@ -201,12 +207,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 const * prop;
-
                        if ((prop = (*niter)->property ("path")) != 0) {
                                old_set_automation_state (*(*niter));
                        } else {
@@ -229,7 +236,7 @@ Processor::set_state (const XMLNode& node, int version)
                }
        }
 
-       bool const a = string_is_affirmative (prop->value ()) && !_session.get_bypass_all_loaded_plugins();
+       bool const a = string_to<bool> (prop->value ()) && !_session.get_bypass_all_loaded_plugins();
        if (_active != a) {
                if (a) {
                        activate ();
@@ -238,9 +245,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;
 }
@@ -275,12 +280,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)
 {