enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index e55d31ce52fa9d3270b6ac1ea08a6e974b34a364..60a23376b6c4c5d15bcd2002dc74899aa349f836 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -42,7 +42,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -126,6 +126,8 @@ 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;
                }
        }
 
@@ -178,8 +180,8 @@ Processor::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
-       const XMLProperty *prop;
-       const XMLProperty *legacy_active = 0;
+       XMLProperty const * prop;
+       XMLProperty const * legacy_active = 0;
        bool leave_name_alone = (node.property ("ignore-name") != 0);
 
        if (!leave_name_alone) {
@@ -203,7 +205,7 @@ Processor::set_state (const XMLNode& node, int version)
 
                if ((*niter)->name() == X_("Automation")) {
 
-                       XMLProperty *prop;
+                       XMLProperty const * prop;
 
                        if ((prop = (*niter)->property ("path")) != 0) {
                                old_set_automation_state (*(*niter));