X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcrossfade.cc;h=fb4325865c0dcf11702b64d5a8955f31e1f8c08b;hb=b5ec66ae6cb60fa43c343d3d29340b2370d0b9d1;hp=337911d3e489eea5cf2f0cb04ab61f37362b046b;hpb=56cd926425310e5534f4a6864b296101ad0477c6;p=ardour.git

diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index 337911d3e4..fb4325865c 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <sigc++/bind.h>
@@ -29,6 +28,7 @@
 #include <ardour/playlist.h>
 #include <ardour/utils.h>
 #include <ardour/session.h>
+#include <ardour/source.h>
 
 #include "i18n.h"
 #include <locale.h>
@@ -77,27 +77,26 @@ 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 ();
 	_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;
@@ -109,11 +108,15 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioR
 	_active = act;
 
 	initialize ();
+
+
 }
 
 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,26 +159,24 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
 	}
 
 	_length = 0;
-	_active = Config->get_xfades_active();
-
 	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;
@@ -202,6 +203,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 ();
@@ -227,17 +235,32 @@ Crossfade::initialize ()
 	_fade_in.add (_length, 1.0);
 	_fade_in.thaw ();
 
-	// _in->StateChanged.connect (sigc::mem_fun (*this, &Crossfade::member_changed));
-	// _out->StateChanged.connect (sigc::mem_fun (*this, &Crossfade::member_changed));
-
 	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, nframes_t start, nframes_t cnt) const
+{
+#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)
+		    nframes_t read_frames, nframes_t skip_frames) const
 {
 	nframes_t offset;
 	nframes_t to_write;
@@ -272,14 +295,21 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
 
 	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
@@ -332,6 +362,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;
 	}
@@ -341,14 +378,14 @@ 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());
+		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;
 	} 
 
@@ -363,7 +400,7 @@ Crossfade::refresh ()
 			} 
 
 			catch (NoCrossfadeHere& err) {
-				Invalidated (shared_from_this());
+				Invalidated (shared_from_this ());
 				return false;
 			}
 
@@ -371,7 +408,7 @@ Crossfade::refresh ()
 
 		} else {
 
-			Invalidated (shared_from_this());
+			Invalidated (shared_from_this ());
 			return false;
 		}
 
@@ -401,7 +438,7 @@ Crossfade::update ()
 	}
 	
 	if (newlen == 0) {
-		Invalidated (shared_from_this());
+		Invalidated (shared_from_this ());
 		return false;
 	}
 	
@@ -554,7 +591,7 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 
 			_in = bottom;
 			_out = top;
-			_anchor_point = StartOfIn;
+			_anchor_point = EndOfOut;
 
 			if (model == FullCrossfade) {
 				_position = bottom->first_frame(); // "{"
@@ -599,26 +636,6 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 	return 0;
 }
 
-void
-Crossfade::member_changed (Change what_changed)
-{
-	Change what_we_care_about = Change (Region::MuteChanged|
-					    Region::LayerChanged|
-					    BoundsChanged);
-
-	if (what_changed & what_we_care_about) {
-		try { 
-			if (what_changed & what_we_care_about) {
-				refresh ();
-			}
-		}
-
-		catch (NoCrossfadeHere& err) {
-			// relax, Invalidated inside refresh()
-		}
-	}
-}
-
 XMLNode&
 Crossfade::get_state () 
 {
@@ -882,5 +899,5 @@ Crossfade::set_short_xfade_length (nframes_t n)
 void
 Crossfade::invalidate ()
 {
-	Invalidated (shared_from_this()); /* EMIT SIGNAL */
+	Invalidated (shared_from_this ()); /* EMIT SIGNAL */
 }