X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fprocessor.cc;h=d571f55688f5e0e283c64ab597704dc87efb9485;hb=456fb789d3adcdb52de3abd863c1bf64c973effa;hp=bf4a8ea6cbb69eb74374ecf8c2d01d00286673f0;hpb=106024330230fca331e2f611fec42ec1f4f43e5a;p=ardour.git

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index bf4a8ea6cb..d571f55688 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";
 
@@ -69,6 +63,7 @@ Processor::Processor(Session& session, const string& name)
 	, _display_to_user (true)
 	, _pre_fader (false)
 	, _ui_pointer (0)
+	, _owner (0)
 {
 }
 
@@ -76,6 +71,7 @@ Processor::Processor (const Processor& other)
 	: Evoral::ControlSet (other)
 	, SessionObject (other.session(), other.name())
 	, Automatable (other.session())
+	, Latent (other)
 	, _pending_active(other._pending_active)
 	, _active(other._active)
 	, _next_ab_is_active(false)
@@ -128,6 +124,9 @@ Processor::state (bool full_state)
 		}
 	}
 
+	snprintf (buf, sizeof (buf), "%" PRId64, _user_latency);
+	node->add_property("user-latency", buf);
+
 	return *node;
 }
 
@@ -137,18 +136,16 @@ 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 ());
 			}
-
-			if ((prop = (*i)->property ("id")) != 0) {
-				_id = prop->value ();
-			}
+			
+			set_id (**i);
 
 			if ((prop = (*i)->property ("active")) != 0) {
 				bool const a = string_is_affirmative (prop->value ());
@@ -175,18 +172,18 @@ 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());
-	}
-
-	// may not exist for legacy 3.0 sessions
-	if ((prop = node.property ("id")) != 0) {
-		_id = 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);
 	}
 
 	XMLNodeList nlist = node.children();
@@ -231,6 +228,10 @@ Processor::set_state (const XMLNode& node, int version)
 		}
 	}
 
+	if ((prop = node.property ("user-latency")) != 0) {
+		_user_latency = atoi (prop->value ());
+	}
+
 	return 0;
 }
 
@@ -269,3 +270,15 @@ Processor::set_ui (void* p)
 {
 	_ui_pointer = p;
 }
+
+void
+Processor::set_owner (SessionObject* o)
+{
+	_owner = o;
+}
+
+SessionObject*
+Processor::owner() const
+{
+	return _owner;
+}