fix (no)use of offset in AudioEngine::get_sync_offset()

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 2e39c52d674e668ed8dd90e9bc86f98450146d12..04706c0c2def6a8674bc1ab24ff9c4321f735c55 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <string>
 
 #include <sigc++/bind.h>
@@ -61,11 +65,25 @@ const string Processor::state_node_name = "Processor";
 Processor::Processor(Session& session, const string& name)
        : SessionObject(session, name)
        , AutomatableControls(session)
+       , _pending_active(false)
+       , _active(false)
+       , _next_ab_is_active(false)
+       , _configured(false)
+       , _gui(0)
+{
+}
+
+Processor::Processor (Session& session, const XMLNode& node)
+       : SessionObject(session, "renameMe")
+       , AutomatableControls(session)
+       , _pending_active(false)
        , _active(false)
        , _next_ab_is_active(false)
        , _configured(false)
        , _gui(0)
 {
+       set_state (node);
+       _pending_active = _active;
 }
 
 XMLNode&
@@ -131,7 +149,6 @@ Processor::set_state (const XMLNode& node)
 {
        const XMLProperty *prop;
        const XMLProperty *legacy_active = 0;
-       const XMLProperty *legacy_placement = 0;
 
        // may not exist for legacy 3.0 sessions
        if ((prop = node.property ("name")) != 0) {
@@ -141,7 +158,7 @@ Processor::set_state (const XMLNode& node)
        // may not exist for legacy 3.0 sessions
        if ((prop = node.property ("id")) != 0) {
                _id = prop->value();
-       }
+       } 
 
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
@@ -181,9 +198,6 @@ Processor::set_state (const XMLNode& node)
                        if ( !(legacy_active = (*niter)->property("active"))) {
                                error << string_compose(_("No %1 property flag in element %2"), "active", (*niter)->name()) << endl;
                        }
-                       if ( !(legacy_placement = (*niter)->property("placement"))) {
-                               error << string_compose(_("No %1 property flag in element %2"), "placement", (*niter)->name()) << endl;
-                       }
                }
        }