add display name to processors (so that it can differ from the "real name"); pay...

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index ab5902efa5e907ad1f83e946cd714d1a99bb1620..e3a2b0b15ef5caf361e821d6f5326be75d5b4546 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>
@@ -142,7 +146,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) {
@@ -152,10 +155,7 @@ Processor::set_state (const XMLNode& node)
        // may not exist for legacy 3.0 sessions
        if ((prop = node.property ("id")) != 0) {
                _id = prop->value();
-               cerr << "---------------- ID for processor " << name() << " = " << _id << endl;
-       } else {
-               cerr << "---------------- NO ID for processor " << name() << endl;
-       }
+       } 
 
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
@@ -195,9 +195,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;
-                       }
                }
        }