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

diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index 70790787c3..86d509ec66 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -19,16 +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/source.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>
@@ -83,7 +83,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> in, boost::shared_ptr<Audio
 	_anchor_point = ap;
 	_follow_overlap = false;
 
-	_active = Config->get_xfades_active ();
+	_active = _session.config.get_xfades_active ();
 	_fixed = true;
 
 	initialize ();
@@ -96,6 +96,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioR
 {
 	_in_update = false;
 	_fixed = false;
+	_follow_overlap = false;
 
 	if (compute (a, b, model)) {
 		throw failed_constructor();
@@ -104,8 +105,6 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioR
 	_active = act;
 
 	initialize ();
-
-
 }
 
 Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
@@ -187,7 +186,7 @@ Crossfade::Crossfade (boost::shared_ptr<Crossfade> orig, boost::shared_ptr<Audio
 	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);
 }
 
 
@@ -271,8 +270,9 @@ Crossfade::initialize ()
 }	
 
 nframes_t 
-Crossfade::read_raw_internal (Sample* buf, nframes_t start, nframes_t cnt) const
+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];
@@ -290,7 +290,7 @@ Crossfade::read_raw_internal (Sample* buf, nframes_t start, nframes_t cnt) const
 
 nframes_t 
 Crossfade::read_at (Sample *buf, Sample *mixdown_buffer, 
-		    float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n,
+		    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;
@@ -320,7 +320,7 @@ 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);
 		
 	}
 
@@ -408,7 +408,7 @@ Crossfade::refresh ()
 
 	int32_t new_layer_relation = (int32_t) (_in->layer() - _out->layer());
 
-	if (new_layer_relation * layer_relation < 0) { // different sign, layers rotated 
+	if (new_layer_relation * layer_relation < 0) { // different sign, layers rotated
 		Invalidated (shared_from_this ());
 		return false;
 	}
@@ -427,7 +427,7 @@ Crossfade::refresh ()
 		if (_follow_overlap) {
 
 			try {
-				compute (_in, _out, Config->get_xfade_model());
+				compute (_in, _out, _session.config.get_xfade_model());
 			} 
 
 			catch (NoCrossfadeHere& err) {
@@ -438,7 +438,6 @@ Crossfade::refresh ()
 			send_signal = true;
 
 		} else {
-
 			Invalidated (shared_from_this ());
 			return false;
 		}
@@ -868,16 +867,16 @@ 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 = 0;
 
@@ -926,9 +925,3 @@ Crossfade::set_short_xfade_length (nframes_t n)
 {
 	_short_xfade_length = n;
 }
-
-void
-Crossfade::invalidate ()
-{
-	Invalidated (shared_from_this ()); /* EMIT SIGNAL */
-}