X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcrossfade.cc;h=dc8d3e3c526f2ec6c2332bb2f9f6ccb13d73e5a0;hb=129ac54a57d2e68edcea16659c169d994dfba140;hp=4f20db5b35dd35584074736412342b8fdb9b63f6;hpb=db8b575c30845bafc34b87bacd52129c95d1c478;p=ardour.git

diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index 4f20db5b35..dc8d3e3c52 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -17,18 +17,15 @@
 
 */
 
-
-#include "pbd/stacktrace.h"
-
 #include "ardour/debug.h"
 #include "ardour/types.h"
 #include "ardour/crossfade.h"
-#include "ardour/crossfade_compare.h"
 #include "ardour/audioregion.h"
 #include "ardour/playlist.h"
 #include "ardour/utils.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
+#include "ardour/region_factory.h"
 
 #include "i18n.h"
 #include <locale.h>
@@ -100,6 +97,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> in, boost::shared_ptr<Audio
 	_out = out;
 	_anchor_point = ap;
 	_fixed = true;
+        _follow_overlap = false;
 
 	initialize ();
 }
@@ -123,7 +121,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioR
 	initialize ();
 }
 
-Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
+Crossfade::Crossfade (const Playlist& playlist, XMLNode const & node)
 	: AudioRegion (playlist.session(), 0, 0, "unnamed crossfade")
 	, CROSSFADE_DEFAULT_PROPERTIES
 	, _fade_in (Evoral::Parameter(FadeInAutomation)) // linear (gain coefficient) => -inf..+6dB
@@ -131,7 +129,7 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
 
 {
 	boost::shared_ptr<Region> r;
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	LocaleGuard lg (X_("POSIX"));
 
 	/* we have to find the in/out regions before we can do anything else */
@@ -143,8 +141,17 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
 
 	PBD::ID id (prop->value());
 
-	if ((r = playlist.find_region (id)) == 0) {
-		error << string_compose (_("Crossfade: no \"in\" region %1 found in playlist %2"), id, playlist.name())
+	r = playlist.find_region (id);
+
+	if (!r) {
+		/* the `in' region is not in a playlist, which probably means that this crossfade
+		   is in the undo record, so we have to find the region in the global region map.
+		*/
+		r = RegionFactory::region_by_id (id);
+	}
+
+	if (!r) {
+		error << string_compose (_("Crossfade: no \"in\" region %1 found in playlist %2 nor in region map"), id, playlist.name())
 		      << endmsg;
 		throw failed_constructor();
 	}
@@ -160,8 +167,14 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
 
 	PBD::ID id2 (prop->value());
 
-	if ((r = playlist.find_region (id2)) == 0) {
-		error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2"), id2, playlist.name())
+	r = playlist.find_region (id2);
+
+	if (!r) {
+		r = RegionFactory::region_by_id (id2);
+	}
+
+	if (!r) {
+		error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2 nor in region map"), id2, playlist.name())
 		      << endmsg;
 		throw failed_constructor();
 	}
@@ -180,7 +193,7 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
 }
 
 Crossfade::Crossfade (boost::shared_ptr<Crossfade> orig, boost::shared_ptr<AudioRegion> newin, boost::shared_ptr<AudioRegion> newout)
-	: AudioRegion (boost::dynamic_pointer_cast<const AudioRegion> (orig), 0, true)
+	: AudioRegion (boost::dynamic_pointer_cast<const AudioRegion> (orig), 0)
 	, CROSSFADE_DEFAULT_PROPERTIES
 	, _fade_in (orig->_fade_in)
 	, _fade_out (orig->_fade_out)
@@ -219,9 +232,18 @@ Crossfade::initialize ()
 
 	_sources = _in->sources();
 	_sources.insert (_sources.end(), _out->sources().begin(), _out->sources().end());
+
+        for (SourceList::iterator i = _sources.begin(); i != _sources.end(); ++i) {
+                (*i)->inc_use_count ();
+        }
+
 	_master_sources = _in->master_sources();
 	_master_sources.insert(_master_sources.end(), _out->master_sources().begin(), _out->master_sources().end());
 
+        for (SourceList::iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) {
+                (*i)->inc_use_count ();
+        }
+
 	_in_update = false;
 
 	_out->suspend_fade_out ();
@@ -292,8 +314,8 @@ Crossfade::read_raw_internal (Sample* buf, framecnt_t start, framecnt_t cnt, int
 	Sample* mixdown = new Sample[cnt];
 	float* gain = new float[cnt];
 	framecnt_t ret;
-	
-	ret = read_at (buf, mixdown, gain, start, cnt, channel, cnt);
+
+	ret = read_at (buf, mixdown, gain, start, cnt, channel);
 
 	delete [] mixdown;
 	delete [] gain;
@@ -303,8 +325,7 @@ Crossfade::read_raw_internal (Sample* buf, framecnt_t start, framecnt_t cnt, int
 
 framecnt_t
 Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
-		    float *gain_buffer, framepos_t start, framecnt_t cnt, uint32_t chan_n,
-		    framecnt_t read_frames, framecnt_t skip_frames) const
+		    float *gain_buffer, framepos_t start, framecnt_t cnt, uint32_t chan_n) const
 {
 	frameoffset_t offset;
 	framecnt_t to_write;
@@ -329,7 +350,7 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
 
 		start = _position;
 		buf += offset;
-		to_write = min (_length.val(), (nframes64_t) cnt);
+		to_write = min (_length.val(), cnt);
 
 	} else {
 
@@ -346,8 +367,8 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
 		memset (crossfade_buffer_in, 0, sizeof (Sample) * to_write);
 	}
 
-	_out->read_at (crossfade_buffer_out, mixdown_buffer, gain_buffer, start, to_write, chan_n, read_frames, skip_frames);
-	_in->read_at (crossfade_buffer_in, mixdown_buffer, gain_buffer, start, to_write, chan_n, read_frames, skip_frames);
+	_out->read_at (crossfade_buffer_out, mixdown_buffer, gain_buffer, start, to_write, chan_n);
+	_in->read_at (crossfade_buffer_in, mixdown_buffer, gain_buffer, start, to_write, chan_n);
 
 	float* fiv = new float[to_write];
 	float* fov = new float[to_write];
@@ -417,6 +438,13 @@ Crossfade::refresh ()
 		return false;
 	}
 
+        /* regions must cannot be identically sized and placed */
+
+        if (_in->position() == _out->position() && _in->length() == _out->length()) {
+		Invalidated (shared_from_this());
+                return false;
+        }
+
 	/* layer ordering cannot change */
 
 	int32_t new_layer_relation = (int32_t) (_in->layer() - _out->layer());
@@ -558,8 +586,8 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 			} else {
 				_position = top->last_frame() - short_xfade_length;
 			}
-
-			_length = min (short_xfade_length, top->length());
+			
+			set_xfade_length (min (short_xfade_length, top->length()));
 			_follow_overlap = false;
 			_anchor_point = EndOfIn;
 			_active = true;
@@ -593,7 +621,7 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 			_in = top;
 			_out = bottom;
 			_position = top->first_frame();
-			_length = min (short_xfade_length, top->length());
+			set_xfade_length (min (short_xfade_length, top->length()));
 			_follow_overlap = false;
 			_anchor_point = StartOfIn;
 			_active = true;
@@ -642,11 +670,11 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 
 			if (model == FullCrossfade) {
 				_position = bottom->first_frame(); // "{"
-				_length = _out->first_frame() + _out->length() - _in->first_frame();
+				set_xfade_length (_out->first_frame() + _out->length() - _in->first_frame());
 				/* leave active alone */
 				_follow_overlap = true;
 			} else {
-				_length = min (short_xfade_length, top->length());
+				set_xfade_length (min (short_xfade_length, top->length()));
 				_position = top->last_frame() - _length;  // "]" - length
 				_active = true;
 				_follow_overlap = false;
@@ -666,11 +694,11 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 			_anchor_point = StartOfIn;
 
 			if (model == FullCrossfade) {
-				_length = _out->first_frame() + _out->length() - _in->first_frame();
+				set_xfade_length (_out->first_frame() + _out->length() - _in->first_frame());
 				/* leave active alone */
 				_follow_overlap = true;
 			} else {
-				_length = min (short_xfade_length, top->length());
+				set_xfade_length (min (short_xfade_length, top->length()));
 				_active = true;
 				_follow_overlap = false;
 
@@ -691,6 +719,8 @@ Crossfade::get_state ()
 	char buf[64];
 	LocaleGuard lg (X_("POSIX"));
 
+	id().print (buf, sizeof (buf));
+	node->add_property ("id", buf);
 	_out->id().print (buf, sizeof (buf));
 	node->add_property ("out", buf);
 	_in->id().print (buf, sizeof (buf));
@@ -748,6 +778,10 @@ Crossfade::set_state (const XMLNode& node, int /*version*/)
 	PropertyChange what_changed;
 	framepos_t val;
 
+	if ((prop = node.property (X_("id")))) {
+		_id = prop->value();
+	}
+
 	if ((prop = node.property ("position")) != 0) {
 		sscanf (prop->value().c_str(), "%" PRId64, &val);
 		if (val != _position) {
@@ -836,6 +870,14 @@ Crossfade::set_state (const XMLNode& node, int /*version*/)
 		}
 	}
 
+        if (_fade_in.size() < 2) {
+                /* fade state somehow saved with no points */
+                return -1;
+        }
+
+        _fade_in.front()->value = 0.0;
+        _fade_in.back()->value = 1.0;
+
 	_fade_in.thaw ();
 
         /* fade out */
@@ -861,9 +903,18 @@ Crossfade::set_state (const XMLNode& node, int /*version*/)
 		}
 	}
 
+        if (_fade_out.size() < 2) {
+                /* fade state somehow saved with no points */
+                return -1;
+        }
+
+        _fade_out.front()->value = 1.0;
+        _fade_out.back()->value = 0.0;
+
 	_fade_out.thaw ();
 
 	PropertyChanged (what_changed); /* EMIT SIGNAL */
+	FadesChanged (); /* EMIT SIGNAL */
 
 	return 0;
 }
@@ -924,7 +975,7 @@ Crossfade::set_xfade_length (framecnt_t len)
 	_length = len;
 
 	PropertyChanged (PropertyChange (Properties::length));
-	
+
 	return len;
 }