X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fprocessor.cc;h=39c3d68ad7941d8ac35a852e057cd2f0486521f6;hb=11b02e90ac9b084cd25741b7a6bdc91c59749c16;hp=335bb0f019c6a12a4822bcf5c64bc0ef18fe7041;hpb=79abf3dfa6d649fbf1fb6fd16cd489f434d0b909;p=ardour.git

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 335bb0f019..39c3d68ad7 100644
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -69,6 +69,10 @@ Processor::Processor(Session& session, const string& name)
 	, _pinmgr_proxy (0)
 	, _owner (0)
 	, _input_latency (0)
+	, _output_latency (0)
+	, _capture_offset (0)
+	, _playback_offset (0)
+	, _loop_location (0)
 {
 }
 
@@ -88,6 +92,10 @@ Processor::Processor (const Processor& other)
 	, _pinmgr_proxy (0)
 	, _owner (0)
 	, _input_latency (0)
+	, _output_latency (0)
+	, _capture_offset (0)
+	, _playback_offset (0)
+	, _loop_location (other._loop_location)
 {
 }
 
@@ -99,7 +107,7 @@ Processor::~Processor ()
 XMLNode&
 Processor::get_state (void)
 {
-	return state (true);
+	return state ();
 }
 
 /* NODE STRUCTURE
@@ -117,7 +125,7 @@ Processor::get_state (void)
 */
 
 XMLNode&
-Processor::state (bool full_state)
+Processor::state ()
 {
 	XMLNode* node = new XMLNode (state_node_name);
 
@@ -129,7 +137,7 @@ Processor::state (bool full_state)
 		node->add_child_copy (*_extra_xml);
 	}
 
-	if (full_state) {
+	if (!skip_saving_automation) {
 		XMLNode& automation = Automatable::get_automation_xml_state();
 		if (!automation.children().empty() || !automation.properties().empty()) {
 			node->add_child_nocopy (automation);
@@ -267,6 +275,34 @@ Processor::configure_io (ChanCount in, ChanCount out)
 	return true;
 }
 
+bool
+Processor::map_loop_range (samplepos_t& start, samplepos_t& end) const
+{
+	if (!_loop_location) {
+		return false;
+	}
+	if (start >= end) {
+		/* no backwards looping */
+		return false;
+	}
+
+	const samplepos_t loop_end = _loop_location->end ();
+	if (start < loop_end) {
+		return false;
+	}
+
+	const samplepos_t loop_start   = _loop_location->start ();
+	const samplecnt_t looplen      = loop_end - loop_start;
+	const sampleoffset_t start_off = (start - loop_start) % looplen;
+	const samplepos_t start_pos    = loop_start + start_off;
+
+	assert (start >= start_pos);
+	end -= start - start_pos;
+	start = start_pos;
+	assert (end > start);
+	return true;
+}
+
 void
 Processor::set_display_to_user (bool yn)
 {
@@ -290,10 +326,3 @@ Processor::owner() const
 {
 	return _owner;
 }
-
-void
-Processor::set_input_latency (framecnt_t cnt)
-{
-	_input_latency = cnt;
-}
-