X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fprocessor.cc;h=3f8fdf509d08eed5767d0e48c44ddb569e4b8ec3;hb=9cbe231b920d92a2e44e08962a3ed6870b962f34;hp=cf641fd7cffefa475dc1f1b9683d25cca5f89798;hpb=4085309cdb07f011756a9ab90047037ef9ad8f20;p=ardour.git

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index cf641fd7cf..3f8fdf509d 100644
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -23,26 +23,18 @@
 
 #include <string>
 
-
-#include "pbd/failed_constructor.h"
-#include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 
+#include "ardour/automatable.h"
+#include "ardour/chan_count.h"
 #include "ardour/processor.h"
-#include "ardour/plugin.h"
-#include "ardour/port.h"
-#include "ardour/route.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/buffer_set.h"
-#include "ardour/send.h"
-#include "ardour/port_insert.h"
-#include "ardour/plugin_insert.h"
-
-#ifdef VST_SUPPORT
-#include "ardour/vst_plugin.h"
+#include "ardour/types.h"
+
+#ifdef WINDOWS_VST_SUPPORT
+#include "ardour/windows_vst_plugin.h"
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 #include "ardour/audio_unit.h"
 #endif
 
@@ -56,6 +48,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class Session; }
+
 // Always saved as Processor, but may be IOProcessor or Send in legacy sessions
 const string Processor::state_node_name = "Processor";
 
@@ -141,15 +135,15 @@ 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) {
@@ -177,17 +171,20 @@ Processor::set_state (const XMLNode& node, int version)
 
 	const XMLProperty *prop;
 	const XMLProperty *legacy_active = 0;
-
-	// may not exist for legacy 3.0 sessions
-	if ((prop = node.property ("name")) != 0) {
-		/* 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());
+	bool leave_name_alone = (node.property ("ignore-name") != 0);
+
+	if (!leave_name_alone) {
+		// may not exist for legacy 3.0 sessions
+		if ((prop = node.property ("name")) != 0) {
+			/* 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());
+		}
+		
+		set_id (node);
 	}
 
-	set_id (node);
-
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;