X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fprocessor.cc;h=60a23376b6c4c5d15bcd2002dc74899aa349f836;hp=d571f55688f5e0e283c64ab597704dc87efb9485;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=fa22520fd257f166c00615e7e40ec10c9e29b948

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index d571f55688..60a23376b6 100644
--- 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;
@@ -63,6 +63,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 +81,9 @@ Processor::Processor (const Processor& other)
 	, _display_to_user (true)
 	, _pre_fader (false)
 	, _ui_pointer (0)
+	, _window_proxy (0)
+	, _pinmgr_proxy (0)
+	, _owner (0)
 {
 }
 
@@ -121,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;
 		}
 	}
 
@@ -136,18 +143,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 +165,8 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
 						deactivate ();
 					}
 				}
-			}
+			}*/
+
 		}
 	}
 
@@ -170,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) {
@@ -182,7 +192,7 @@ Processor::set_state (const XMLNode& node, int version)
 			*/
 			Processor::set_name (prop->value());
 		}
-		
+
 		set_id (node);
 	}
 
@@ -195,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));
@@ -219,7 +229,7 @@ Processor::set_state (const XMLNode& node, int version)
 		}
 	}
 
-	bool const a = string_is_affirmative (prop->value ());
+	bool const a = string_is_affirmative (prop->value ()) && !_session.get_bypass_all_loaded_plugins();
 	if (_active != a) {
 		if (a) {
 			activate ();