X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcrossfade.cc;h=86d509ec664c9799192ff859563852ace9c16f8e;hb=28af0265b5867a4ad9bd35e2d98eadd7f1264693;hp=f142d57628a1c1bbbb0df231a1be0cf5717aab3d;hpb=2a52135c663e9a60b5f0cc9cc6673799c3ea5549;p=ardour.git

diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index f142d57628..86d509ec66 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -19,15 +19,16 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/stacktrace.h>
+#include "pbd/stacktrace.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/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 "i18n.h"
 #include <locale.h>
@@ -50,15 +51,11 @@ Sample* Crossfade::crossfade_buffer_in = 0;
 void
 Crossfade::set_buffer_size (nframes_t sz)
 {
-	if (crossfade_buffer_out) {
-		delete [] crossfade_buffer_out;
-		crossfade_buffer_out = 0;
-	}
+	delete [] crossfade_buffer_out;
+	crossfade_buffer_out = 0;
 
-	if (crossfade_buffer_in) {
-		delete [] crossfade_buffer_in;
-		crossfade_buffer_in = 0;
-	}
+	delete [] crossfade_buffer_in;
+	crossfade_buffer_in = 0;
 
 	if (sz) {
 		crossfade_buffer_out = new Sample[sz];
@@ -76,30 +73,30 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> in, boost::shared_ptr<Audio
 		      nframes_t length,
 		      nframes_t position,
 		      AnchorPoint ap)
-	: _fade_in (0.0, 2.0, 1.0), // linear (gain coefficient) => -inf..+6dB
-	  _fade_out (0.0, 2.0, 1.0) // linear (gain coefficient) => -inf..+6dB
+	: AudioRegion (in->session(), position, length, "foobar"),
+	  _fade_in (Evoral::Parameter(FadeInAutomation)), // linear (gain coefficient) => -inf..+6dB
+	  _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
+
 {
 	_in = in;
 	_out = out;
-	
-	_length = length;
-	_position = position;
 	_anchor_point = ap;
-
 	_follow_overlap = false;
 
-	_active = Config->get_xfades_active ();
+	_active = _session.config.get_xfades_active ();
 	_fixed = true;
-		
+
 	initialize ();
 }
 
 Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioRegion> b, CrossfadeModel model, bool act)
-	: _fade_in (0.0, 2.0, 1.0), // linear (gain coefficient) => -inf..+6dB
-	  _fade_out (0.0, 2.0, 1.0) // linear (gain coefficient) => -inf..+6dB
+	: AudioRegion (a->session(), 0, 0, "foobar"),
+	  _fade_in (Evoral::Parameter(FadeInAutomation)), // linear (gain coefficient) => -inf..+6dB
+	  _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
 {
 	_in_update = false;
 	_fixed = false;
+	_follow_overlap = false;
 
 	if (compute (a, b, model)) {
 		throw failed_constructor();
@@ -111,8 +108,10 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioR
 }
 
 Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
-	:  _fade_in (0.0, 2.0, 1.0), // linear (gain coefficient) => -inf..+6dB
-	   _fade_out (0.0, 2.0, 1.0) // linear (gain coefficient) => -inf..+6dB
+	: AudioRegion (playlist.session(), 0, 0, "foobar"),
+	  _fade_in (Evoral::Parameter(FadeInAutomation)), // linear (gain coefficient) => -inf..+6dB
+	  _fade_out (Evoral::Parameter(FadeOutAutomation)) // linear (gain coefficient) => -inf..+6dB
+
 {
 	boost::shared_ptr<Region> r;
 	XMLProperty* prop;
@@ -156,23 +155,23 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
 
 	_length = 0;
 	initialize();
+	_active = true;
 	
 	if (set_state (node)) {
 		throw failed_constructor();
 	}
 }
 
-Crossfade::Crossfade (const Crossfade &orig, boost::shared_ptr<AudioRegion> newin, boost::shared_ptr<AudioRegion> newout)
-	: _fade_in(orig._fade_in),
-	  _fade_out(orig._fade_out)
+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)),
+	  _fade_in (orig->_fade_in),
+	  _fade_out (orig->_fade_out)
 {
-	_active           = orig._active;
-	_in_update        = orig._in_update;
-	_length           = orig._length;
-	_position         = orig._position;
-	_anchor_point     = orig._anchor_point;
-	_follow_overlap   = orig._follow_overlap;
-	_fixed            = orig._fixed;
+	_active           = orig->_active;
+	_in_update        = orig->_in_update;
+	_anchor_point     = orig->_anchor_point;
+	_follow_overlap   = orig->_follow_overlap;
+	_fixed            = orig->_fixed;
 	
 	_in = newin;
 	_out = newout;
@@ -187,7 +186,7 @@ Crossfade::Crossfade (const Crossfade &orig, boost::shared_ptr<AudioRegion> newi
 	layer_relation = (int32_t) (_in->layer() - _out->layer());
 
 	// Let's make sure the fade isn't too long
-	set_length(_length);
+	set_xfade_length(_length);
 }
 
 
@@ -199,6 +198,13 @@ Crossfade::~Crossfade ()
 void
 Crossfade::initialize ()
 {
+	/* merge source lists from regions */
+
+	_sources = _in->sources();
+	_sources.insert (_sources.end(), _out->sources().begin(), _out->sources().end());
+	_master_sources = _in->master_sources();
+	_master_sources.insert(_master_sources.end(), _out->master_sources().begin(), _out->master_sources().end());
+	
 	_in_update = false;
 	
 	_out->suspend_fade_out ();
@@ -206,32 +212,86 @@ Crossfade::initialize ()
 
 	_fade_out.freeze ();
 	_fade_out.clear ();
-	_fade_out.add (0.0, 1.0);
-	_fade_out.add ((_length * 0.1), 0.99);
-	_fade_out.add ((_length * 0.2), 0.97);
-	_fade_out.add ((_length * 0.8), 0.03);
-	_fade_out.add ((_length * 0.9), 0.01);
-	_fade_out.add (_length, 0.0);
+
+#define EQUAL_POWER_MINUS_3DB
+#ifdef  EQUAL_POWER_MINUS_3DB
+
+	_fade_out.add ((_length * 0.000000), 1.000000);
+	_fade_out.add ((_length * 0.166667), 0.948859);
+	_fade_out.add ((_length * 0.333333), 0.851507);
+	_fade_out.add ((_length * 0.500000), 0.707946);
+	_fade_out.add ((_length * 0.666667), 0.518174);
+	_fade_out.add ((_length * 0.833333), 0.282192);
+	_fade_out.add ((_length * 1.000000), 0.000000);
+
+#else // EQUAL_POWER_MINUS_6DB
+
+	_fade_out.add ((_length * 0.000000), 1.000000);
+	_fade_out.add ((_length * 0.166667), 0.833033);
+	_fade_out.add ((_length * 0.333333), 0.666186);
+	_fade_out.add ((_length * 0.500000), 0.499459);
+	_fade_out.add ((_length * 0.666667), 0.332853);
+	_fade_out.add ((_length * 0.833333), 0.166366);
+	_fade_out.add ((_length * 1.000000), 0.000000);
+#endif
+
 	_fade_out.thaw ();
 	
 	_fade_in.freeze ();
 	_fade_in.clear ();
-	_fade_in.add (0.0, 0.0);
-	_fade_in.add ((_length * 0.1),  0.01);
-	_fade_in.add ((_length * 0.2),  0.03);
-	_fade_in.add ((_length * 0.8),  0.97);
-	_fade_in.add ((_length * 0.9),  0.99);
-	_fade_in.add (_length, 1.0);
+
+#define EQUAL_POWER_MINUS_3DB
+#ifdef  EQUAL_POWER_MINUS_3DB
+
+	_fade_in.add ((_length * 0.000000), 0.000000);
+	_fade_in.add ((_length * 0.166667), 0.282192);
+	_fade_in.add ((_length * 0.333333), 0.518174);
+	_fade_in.add ((_length * 0.500000), 0.707946);
+	_fade_in.add ((_length * 0.666667), 0.851507);
+	_fade_in.add ((_length * 0.833333), 0.948859);
+	_fade_in.add ((_length * 1.000000), 1.000000);
+
+#else // EQUAL_POWER_MINUS_SIX_DB
+
+	_fade_in.add ((_length * 0.000000), 0.000000);
+	_fade_in.add ((_length * 0.166667), 0.166366);
+	_fade_in.add ((_length * 0.333333), 0.332853);
+	_fade_in.add ((_length * 0.500000), 0.499459);
+	_fade_in.add ((_length * 0.666667), 0.666186);
+	_fade_in.add ((_length * 0.833333), 0.833033);
+	_fade_in.add ((_length * 1.000000), 1.000000);
+
+#endif
+
 	_fade_in.thaw ();
 
 	overlap_type = _in->coverage (_out->position(), _out->last_frame());
 	layer_relation = (int32_t) (_in->layer() - _out->layer());
 }	
 
+nframes_t 
+Crossfade::read_raw_internal (Sample* /*buf*/, sframes_t /*start*/, nframes_t cnt, int /*channel*/) const
+{
+	// FIXME: Why is this disabled?
+#if 0
+	Sample* mixdown = new Sample[cnt];
+	float* gain = new float[cnt];
+	nframes_t ret;
+
+	ret = read_at (buf, mixdown, gain, start, cnt, chan_n, cnt);
+
+	delete [] mixdown;
+	delete [] gain;
+
+	return ret;
+#endif
+	return cnt;
+}
+
 nframes_t 
 Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, 
-		    float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n,
-		    nframes_t read_frames, nframes_t skip_frames)
+		    float *gain_buffer, sframes_t start, nframes_t cnt, uint32_t chan_n,
+		    nframes_t read_frames, nframes_t skip_frames) const
 {
 	nframes_t offset;
 	nframes_t to_write;
@@ -260,20 +320,27 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
 
 	} else {
 		
-		to_write = min (_length - (start - _position), cnt);
+		to_write = min (nframes_t(_length - (start - _position)), cnt);
 		
 	}
 
 	offset = start - _position;
 
+	/* Prevent data from piling up inthe crossfade buffers when reading a transparent region */
+	if (!(_out->opaque())) {
+		memset (crossfade_buffer_out, 0, sizeof (Sample) * to_write);
+	} else if (!(_in->opaque())) {
+		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);
 
 	float* fiv = new float[to_write];
 	float* fov = new float[to_write];
 
-	_fade_in.get_vector (offset, offset+to_write, fiv, to_write);
-	_fade_out.get_vector (offset, offset+to_write, fov, to_write);
+	_fade_in.curve().get_vector (offset, offset+to_write, fiv, to_write);
+	_fade_out.curve().get_vector (offset, offset+to_write, fov, to_write);
 
 	/* note: although we have not explicitly taken into account the return values
 	   from _out->read_at() or _in->read_at(), the length() function does this
@@ -326,6 +393,13 @@ Crossfade::refresh ()
 	/* crossfades must be between non-muted regions */
 	
 	if (_out->muted() || _in->muted()) {
+		Invalidated (shared_from_this ());
+		return false;
+	}
+
+	/* Top layer shouldn't be transparent */
+	
+	if (!((layer_relation > 0 ? _in : _out)->opaque())) {
 		Invalidated (shared_from_this());
 		return false;
 	}
@@ -334,15 +408,15 @@ Crossfade::refresh ()
 
 	int32_t new_layer_relation = (int32_t) (_in->layer() - _out->layer());
 
-	if (new_layer_relation * layer_relation < 0) { // different sign, layers rotated 
-		Invalidated (shared_from_this());
+	if (new_layer_relation * layer_relation < 0) { // different sign, layers rotated
+		Invalidated (shared_from_this ());
 		return false;
 	}
 
 	OverlapType ot = _in->coverage (_out->first_frame(), _out->last_frame());
 
 	if (ot == OverlapNone) {
-		Invalidated (shared_from_this());
+		Invalidated (shared_from_this ());
 		return false;
 	} 
 
@@ -353,19 +427,18 @@ Crossfade::refresh ()
 		if (_follow_overlap) {
 
 			try {
-				compute (_in, _out, Config->get_xfade_model());
+				compute (_in, _out, _session.config.get_xfade_model());
 			} 
 
 			catch (NoCrossfadeHere& err) {
-				Invalidated (shared_from_this());
+				Invalidated (shared_from_this ());
 				return false;
 			}
 
 			send_signal = true;
 
 		} else {
-
-			Invalidated (shared_from_this());
+			Invalidated (shared_from_this ());
 			return false;
 		}
 
@@ -395,7 +468,7 @@ Crossfade::update ()
 	}
 	
 	if (newlen == 0) {
-		Invalidated (shared_from_this());
+		Invalidated (shared_from_this ());
 		return false;
 	}
 	
@@ -794,18 +867,18 @@ Crossfade::set_follow_overlap (bool yn)
 	_follow_overlap = yn;
 
 	if (!yn) {
-		set_length (_short_xfade_length);
+		set_xfade_length (_short_xfade_length);
 	} else {
-		set_length (_out->first_frame() + _out->length() - _in->first_frame());
+		set_xfade_length (_out->first_frame() + _out->length() - _in->first_frame());
 	}
 
 	StateChanged (FollowOverlapChanged);
 }
 
 nframes_t
-Crossfade::set_length (nframes_t len)
+Crossfade::set_xfade_length (nframes_t len)
 {
-	nframes_t limit;
+	nframes_t limit = 0;
 
 	switch (_anchor_point) {
 	case StartOfIn:
@@ -852,9 +925,3 @@ Crossfade::set_short_xfade_length (nframes_t n)
 {
 	_short_xfade_length = n;
 }
-
-void
-Crossfade::invalidate ()
-{
-	Invalidated (shared_from_this()); /* EMIT SIGNAL */
-}