Merged with trunk R1304

git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 files changed, 179 insertions, 147 deletions

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index c0d5ed6e75..36fe027a6f 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -37,7 +37,7 @@ class Source;
 class AudioPlaylist : public ARDOUR::Playlist
 {
   public:
-	typedef std::list<Crossfade*> Crossfades;
+	typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
 	
    public:
 	AudioPlaylist (Session&, const XMLNode&, bool hidden = false);
@@ -53,9 +53,9 @@ class AudioPlaylist : public ARDOUR::Playlist
 
 	int set_state (const XMLNode&);
 
-	sigc::signal<void,Crossfade *> NewCrossfade; 
+	sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; 
 
-	template<class T> void foreach_crossfade (T *t, void (T::*func)(Crossfade *));
+	template<class T> void foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>));
 	void crossfades_at (nframes_t frame, Crossfades&);
 
 	bool destroy_region (boost::shared_ptr<Region>);
@@ -63,7 +63,7 @@ class AudioPlaylist : public ARDOUR::Playlist
     protected:
 
 	/* playlist "callbacks" */
-	void notify_crossfade_added (Crossfade *);
+	void notify_crossfade_added (boost::shared_ptr<Crossfade>);
 	void flush_notifications ();
 
 	void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right);
@@ -73,16 +73,16 @@ class AudioPlaylist : public ARDOUR::Playlist
         void remove_dependents (boost::shared_ptr<Region> region);
 
     private:
-       Crossfades      _crossfades;    /* xfades currently in use */
+       Crossfades      _crossfades;
        Crossfades      _pending_xfade_adds;
 
-       void crossfade_invalidated (Crossfade*);
+       void crossfade_invalidated (boost::shared_ptr<Crossfade>);
        XMLNode& state (bool full_state);
        void dump () const;
 
        bool region_changed (Change, boost::shared_ptr<Region>);
        void crossfade_changed (Change);
-       void add_crossfade (Crossfade&);
+       void add_crossfade (boost::shared_ptr<Crossfade>);
 
        void source_offset_changed (boost::shared_ptr<AudioRegion> region);
 };
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 0422698c5e..946d35b8e0 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -24,6 +24,7 @@
 #include <vector>
 #include <algorithm>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 #include <sigc++/signal.h>
 
@@ -40,7 +41,7 @@ namespace ARDOUR {
 class AudioRegion;
 class Playlist;
 
-class Crossfade : public PBD::StatefulDestructible
+class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_from_this<ARDOUR::Crossfade>
 {
   public:
 
@@ -111,7 +112,7 @@ class Crossfade : public PBD::StatefulDestructible
 
 	void invalidate();
 
-	sigc::signal<void,Crossfade*> Invalidated;
+	sigc::signal<void,boost::shared_ptr<Crossfade> > Invalidated;
 	sigc::signal<void,Change>     StateChanged;
 
 	bool covers (nframes_t frame) const {
diff --git a/libs/ardour/ardour/playlist_templates.h b/libs/ardour/ardour/playlist_templates.h
index 7ce6c1818c..603e0bef37 100644
--- a/libs/ardour/ardour/playlist_templates.h
+++ b/libs/ardour/ardour/playlist_templates.h
@@ -23,7 +23,7 @@
 
 namespace ARDOUR {
 
-template<class T> void AudioPlaylist::foreach_crossfade (T *t, void (T::*func)(Crossfade *)) {
+template<class T> void AudioPlaylist::foreach_crossfade (T *t, void (T::*func)(boost::shared_ptr<Crossfade>)) {
 	RegionLock rlock (this, false);
 	for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); i++) {	
 		(t->*func) (*i);
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 91bed1a4fa..dcba0ae31c 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -65,7 +65,7 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
 		boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*in_o);
 
 		// We look only for crossfades which begin with the current region, so we don't get doubles
-		for (list<Crossfade *>::const_iterator xfades = other->_crossfades.begin(); xfades != other->_crossfades.end(); ++xfades) {
+		for (Crossfades::const_iterator xfades = other->_crossfades.begin(); xfades != other->_crossfades.end(); ++xfades) {
 			if ((*xfades)->in() == ar) {
 				// We found one! Now copy it!
 
@@ -79,8 +79,8 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, stri
 					if ((*xfades)->out() == ar2) {
 						boost::shared_ptr<AudioRegion>in  = boost::dynamic_pointer_cast<AudioRegion>(*in_n);
 						boost::shared_ptr<AudioRegion>out = boost::dynamic_pointer_cast<AudioRegion>(*out_n);
-						Crossfade *new_fade = new Crossfade (*(*xfades), in, out);
-						add_crossfade(*new_fade);
+						boost::shared_ptr<Crossfade> new_fade = boost::shared_ptr<Crossfade> (new Crossfade (*(*xfades), in, out));
+						add_crossfade(new_fade);
 						break;
 					}
 					
@@ -104,31 +104,13 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr<const AudioPlaylist> other, nfra
 
 AudioPlaylist::~AudioPlaylist ()
 {
-	set<Crossfade*> all_xfades;
-
   	GoingAway (); /* EMIT SIGNAL */
 
 	/* drop connections to signals */
 
 	notify_callbacks ();
 	
-
-	cerr << "deleting crossfades "  << _crossfades.size() << endl;
-
-	for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end(); ) {
-		Crossfades::iterator tmp;
-
-		tmp = x;
-		++tmp;
-
-		delete *x;
-
-		cerr << _crossfades.size() << " to go\n";
-
-		x = tmp;
-	}
-
-	cerr << "done\n";
+	_crossfades.clear ();
 }
 
 struct RegionSortByLayer {
@@ -174,7 +156,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 	_read_data_count = 0;
 
 	map<uint32_t,vector<boost::shared_ptr<Region> > > relevant_regions;
-	map<uint32_t,vector<Crossfade*> > relevant_xfades;
+	map<uint32_t,vector<boost::shared_ptr<Crossfade> > > relevant_xfades;
 	vector<uint32_t> relevant_layers;
 
 	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
@@ -204,7 +186,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 	for (vector<uint32_t>::iterator l = relevant_layers.begin(); l != relevant_layers.end(); ++l) {
 
 		vector<boost::shared_ptr<Region> > r (relevant_regions[*l]);
-		vector<Crossfade*>& x (relevant_xfades[*l]);
+		vector<boost::shared_ptr<Crossfade> >& x (relevant_xfades[*l]);
 
 		for (vector<boost::shared_ptr<Region> >::iterator i = r.begin(); i != r.end(); ++i) {
 			boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*i);
@@ -213,7 +195,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 			_read_data_count += ar->read_data_count();
 		}
 		
-		for (vector<Crossfade*>::iterator i = x.begin(); i != x.end(); ++i) {
+		for (vector<boost::shared_ptr<Crossfade> >::iterator i = x.begin(); i != x.end(); ++i) {
 			(*i)->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n);
 
 			/* don't JACK up _read_data_count, since its the same data as we just
@@ -229,7 +211,6 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
 void
 AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {
-	Crossfades::iterator i, tmp;
 	boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
 
 	if (in_set_state) {
@@ -242,16 +223,13 @@ AudioPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 		return;
 	}
 
-	for (i = _crossfades.begin(); i != _crossfades.end(); ) {
-		tmp = i;
-		tmp++;
-
+	for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ) {
 		
 		if ((*i)->involves (r)) {
-			delete *i;
+			i = _crossfades.erase (i);
+		} else {
+			++i;
 		}
-		
-		i = tmp;
 	}
 }
 
@@ -281,7 +259,7 @@ void
 AudioPlaylist::refresh_dependents (boost::shared_ptr<Region> r)
 {
 	boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
-	set<Crossfade*> updated;
+	set<boost::shared_ptr<Crossfade> > updated;
 
 	if (ar == 0) {
 		return;
@@ -322,29 +300,29 @@ AudioPlaylist::finalize_split_region (boost::shared_ptr<Region> o, boost::shared
 		tmp = x;
 		++tmp;
 
-		Crossfade *fade = 0;
+		boost::shared_ptr<Crossfade> fade;
 		
 		if ((*x)->_in == orig) {
 			if (! (*x)->covers(right->position())) {
-				fade = new Crossfade (**x, left, (*x)->_out);
+				fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, left, (*x)->_out));
 			} else {
 				// Overlap, the crossfade is copied on the left side of the right region instead
-				fade = new Crossfade (**x, right, (*x)->_out);
+				fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, right, (*x)->_out));
 			}
 		}
 		
 		if ((*x)->_out == orig) {
 			if (! (*x)->covers(right->position())) {
-				fade = new Crossfade (**x, (*x)->_in, right);
+				fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, (*x)->_in, right));
 			} else {
 				// Overlap, the crossfade is copied on the right side of the left region instead
-				fade = new Crossfade (**x, (*x)->_in, left);
+				fade = boost::shared_ptr<Crossfade> (new Crossfade (**x, (*x)->_in, left));
 			}
 		}
 		
 		if (fade) {
 			_crossfades.remove (*x);
-			add_crossfade (*fade);
+			add_crossfade (fade);
 		}
 		x = tmp;
 	}
@@ -357,7 +335,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 	boost::shared_ptr<AudioRegion> region;
 	boost::shared_ptr<AudioRegion> top;
 	boost::shared_ptr<AudioRegion> bottom;
-	Crossfade*   xfade;
+	boost::shared_ptr<Crossfade>   xfade;
 
 	if (in_set_state || in_partition) {
 		return;
@@ -381,6 +359,8 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 
 	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
 
+		nframes_t xfade_length;
+
 		other = boost::dynamic_pointer_cast<AudioRegion> (*i);
 
 		if (other == region) {
@@ -390,6 +370,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 		if (other->muted() || region->muted()) {
 			continue;
 		}
+		
 
 		if (other->layer() < region->layer()) {
 			top = region;
@@ -399,50 +380,55 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 			bottom = region;
 		}
 
+
+		OverlapType c = top->coverage (bottom->position(), bottom->last_frame());
+		
 		try {
+			switch (c) {
+			case OverlapNone:
+				break;
+
+			case OverlapInternal:
+				 /* {=============== top  =============}
+				  *     [ ----- bottom  ------- ]
+				  */
+				break;
+
+			case OverlapExternal:
+
+				/*     [ -------- top ------- ]
+				 * {=========== bottom =============}
+				 */
 				
-			if (top->coverage (bottom->position(), bottom->last_frame()) != OverlapNone) {
+				/* to avoid discontinuities at the region boundaries of an internal
+				   overlap (this region is completely within another), we create
+				   two hidden crossfades at each boundary. this is not dependent
+				   on the auto-xfade option, because we require it as basic
+				   audio engineering.
+				*/
 				
-				/* check if the upper region is within the lower region */
+				xfade_length = min ((nframes_t) 720, top->length());
 				
-				if (top->first_frame() > bottom->first_frame() &&
-				    top->last_frame() < bottom->last_frame()) {
-					
-					
-					/*     [ -------- top ------- ]
-					 * {=========== bottom =============}
-					 */
-					
-					/* to avoid discontinuities at the region boundaries of an internal
-					   overlap (this region is completely within another), we create
-					   two hidden crossfades at each boundary. this is not dependent
-					   on the auto-xfade option, because we require it as basic
-					   audio engineering.
+				xfade = boost::shared_ptr<Crossfade> (new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn));
+				add_crossfade (xfade);
+				
+				if (top_region_at (top->last_frame() - 1) == top) {
+					/* 
+					   only add a fade out if there is no region on top of the end of 'top' (which 
+					   would cover it).
 					*/
 					
-					nframes_t xfade_length = min ((nframes_t) 720, top->length());
-					
-					                    /*  in,      out */
-					xfade = new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn);
-					add_crossfade (*xfade);
-
-					if (top_region_at (top->last_frame() - 1) == top) {
-					  /* 
-					     only add a fade out if there is no region on top of the end of 'top' (which 
-					     would cover it).
-					  */
-					  xfade = new Crossfade (bottom, top, xfade_length, top->last_frame() - xfade_length, EndOfOut);
-					  add_crossfade (*xfade);
-					}
-					
-				} else {
-
-					xfade = new Crossfade (other, region, Config->get_xfade_model(), Config->get_xfades_active());
-					add_crossfade (*xfade);
+					xfade = boost::shared_ptr<Crossfade> (new Crossfade (bottom, top, xfade_length, top->last_frame() - xfade_length, EndOfOut));
+					add_crossfade (xfade);
 				}
-			} 
+				break;
+				
+			default:
+				xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active()));
+				add_crossfade (xfade);
+			}
 		}
-		
+
 		catch (failed_constructor& err) {
 			continue;
 		}
@@ -455,32 +441,29 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 }
 
 void
-AudioPlaylist::add_crossfade (Crossfade& xfade)
+AudioPlaylist::add_crossfade (boost::shared_ptr<Crossfade> xfade)
 {
 	Crossfades::iterator ci;
 
-	cerr << "adding xfade involving " << xfade.in()->name() << " and " << xfade.out()->name() << endl;
-
 	for (ci = _crossfades.begin(); ci != _crossfades.end(); ++ci) {
-		cerr << "\tcompare to " << (*ci)->in()->name() << " and " << (*ci)->out()->name() << endl;
-		if (*(*ci) == xfade) { // Crossfade::operator==()
+		if (*(*ci) == *xfade) { // Crossfade::operator==()
 			break;
 		}
 	}
 	
 	if (ci != _crossfades.end()) {
-		delete &xfade;
+		// it will just go away
 	} else {
-		_crossfades.push_back (&xfade);
+		_crossfades.push_back (xfade);
 
-		xfade.Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
-		xfade.StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
+		xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
+		xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
 
-		notify_crossfade_added (&xfade);
+		notify_crossfade_added (xfade);
 	}
 }
 	
-void AudioPlaylist::notify_crossfade_added (Crossfade *x)
+void AudioPlaylist::notify_crossfade_added (boost::shared_ptr<Crossfade> x)
 {
 	if (g_atomic_int_get(&block_notifications)) {
 		_pending_xfade_adds.insert (_pending_xfade_adds.end(), x);
@@ -490,7 +473,7 @@ void AudioPlaylist::notify_crossfade_added (Crossfade *x)
 }
 
 void
-AudioPlaylist::crossfade_invalidated (Crossfade* xfade)
+AudioPlaylist::crossfade_invalidated (boost::shared_ptr<Crossfade> xfade)
 {
 	Crossfades::iterator i;
 
@@ -525,7 +508,7 @@ AudioPlaylist::set_state (const XMLNode& node)
 		}
 
 		try {
-			Crossfade* xfade = new Crossfade (*((const Playlist *)this), *child);
+			boost::shared_ptr<Crossfade> xfade = boost::shared_ptr<Crossfade> (new Crossfade (*((const Playlist *)this), *child));
 			_crossfades.push_back (xfade);
 			xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
 			xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
@@ -549,19 +532,7 @@ AudioPlaylist::set_state (const XMLNode& node)
 void
 AudioPlaylist::clear (bool with_signals)
 {
-	for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ) {
-
-		Crossfades::iterator tmp;
-		tmp = i;
-		++tmp;
-
-		delete *i;
-
-		i = tmp;
-	}
-
 	_crossfades.clear ();
-	
 	Playlist::clear (with_signals);
 }
 
@@ -583,7 +554,7 @@ void
 AudioPlaylist::dump () const
 {
 	boost::shared_ptr<Region>r;
-	Crossfade *x;
+	boost::shared_ptr<Crossfade> x;
 
 	cerr << "Playlist \"" << _name << "\" " << endl
 	     << regions.size() << " regions "
@@ -623,7 +594,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 	boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
 	bool changed = false;
 	Crossfades::iterator c, ctmp;
-	set<Crossfade*> unique_xfades;
+	set<boost::shared_ptr<Crossfade> > unique_xfades;
 
 	if (r == 0) {
 		fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist")
@@ -676,10 +647,6 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 		c = ctmp;
 	}
 
-	for (set<Crossfade*>::iterator c = unique_xfades.begin(); c != unique_xfades.end(); ++c) {
-		delete *c;
-	}
-
 	if (changed) {
 		/* overload this, it normally means "removed", not destroyed */
 		notify_region_removed (region);
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index be070c74e6..816e3bbf0c 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -413,7 +413,8 @@ void
 AudioEngine::start_metering_thread ()
 {
 	if (m_meter_thread == 0) {
-		m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), true);
+		m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread),
+				500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
 	}
 }
 
diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index fd2fced83c..31970a7646 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -20,6 +20,8 @@
 
 #include <sigc++/bind.h>
 
+#include <pbd/stacktrace.h>
+
 #include <ardour/types.h>
 #include <ardour/crossfade.h>
 #include <ardour/crossfade_compare.h>
@@ -80,6 +82,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> in, boost::shared_ptr<Audio
 {
 	_in = in;
 	_out = out;
+	
 	_length = length;
 	_position = position;
 	_anchor_point = ap;
@@ -197,9 +200,8 @@ Crossfade::Crossfade (const Crossfade &orig, boost::shared_ptr<AudioRegion> newi
 
 Crossfade::~Crossfade ()
 {
-	cerr << "Deleting xfade @ " << this << endl;
-	Invalidated (this);
-	cerr << "invalidation signal sent\n";
+	cerr << "Crossfade deleted\n";
+	notify_callbacks ();
 }
 
 void
@@ -256,6 +258,8 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 	/* first check for matching ends */
 	
 	if (top->first_frame() == bottom->first_frame()) {
+
+		cerr << "same start\n";
 		
 		/* Both regions start at the same point */
 		
@@ -297,6 +301,8 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 		
 	} else if (top->last_frame() == bottom->last_frame()) {
 		
+		cerr << "same end\n";
+
 		/* Both regions end at the same point */
 		
 		if (top->first_frame() > bottom->first_frame()) {
@@ -335,17 +341,21 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 
 		OverlapType ot = top->coverage (bottom->first_frame(), bottom->last_frame());
 
+		cerr << "ot = " << ot << endl;
+
 		switch (ot) {
 		case OverlapNone:
 			/* should be NOTREACHED as a precondition of creating
 			   a new crossfade, but we need to handle it here.
 			*/
+			cerr << "no sir\n";
 			throw NoCrossfadeHere();
 			break;
 			
 		case OverlapInternal:
 		case OverlapExternal:
 			/* should be NOTREACHED because of tests above */
+			cerr << "nu-uh\n";
 			throw NoCrossfadeHere();
 			break;
 			
@@ -357,15 +367,16 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 
 			_in = bottom;
 			_out = top;
-			_position = bottom->first_frame();
 			_anchor_point = StartOfIn;
 
 			if (model == FullCrossfade) {
+				_position = bottom->first_frame(); // "{"
 				_length = _out->first_frame() + _out->length() - _in->first_frame();
 				/* leave active alone */
 				_follow_overlap = true;
 			} else {
 				_length = min (short_xfade_length, top->length());
+				_position = top->last_frame() - _length;  // "]" - length 
 				_active = true;
 				_follow_overlap = false;
 				
@@ -499,7 +510,13 @@ Crossfade::refresh ()
 	/* crossfades must be between non-muted regions */
 	
 	if (_out->muted() || _in->muted()) {
-		Invalidated (this);
+		Invalidated (shared_from_this());
+		return false;
+	}
+
+	if (_in->layer() < _out->layer()) {
+		cerr << "layer change, invalidated\n";
+		Invalidated (shared_from_this());
 		return false;
 	}
 
@@ -508,11 +525,11 @@ Crossfade::refresh ()
 	OverlapType ot;
 	
 	ot = _in->coverage (_out->first_frame(), _out->last_frame());
-	
+
 	switch (ot) {
 	case OverlapNone:
 	case OverlapInternal:
-		Invalidated (this);
+		Invalidated (shared_from_this());
 		return false;
 		
 	default:
@@ -522,7 +539,7 @@ Crossfade::refresh ()
 	/* overlap type must not have altered */
 	
 	if (ot != overlap_type) {
-		Invalidated (this);
+		Invalidated (shared_from_this());
 		return false;
 	} 
 
@@ -543,7 +560,7 @@ Crossfade::update (bool force)
 	}
 
 	if (newlen == 0) {
-		Invalidated (this);
+		Invalidated (shared_from_this());
 		return false;
 	}
 
@@ -563,7 +580,13 @@ Crossfade::update (bool force)
 	switch (_anchor_point) {
 	case StartOfIn:
 		if (_position != _in->first_frame()) {
-			_position = _in->first_frame();
+			if (_length > _short_xfade_length) {
+				/* assume FullCrossfade */
+				_position = _in->first_frame();
+			} else {
+				/* assume short xfade */
+				_position = _out->last_frame() - _length;
+			}
 		}
 		break;
 
@@ -865,5 +888,5 @@ Crossfade::set_short_xfade_length (nframes_t n)
 void
 Crossfade::invalidate ()
 {
-	Invalidated (this); /* EMIT SIGNAL */
+	Invalidated (shared_from_this()); /* EMIT SIGNAL */
 }
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 515d9e1c2f..2806ab60a8 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -197,43 +197,44 @@ setup_hardware_optimization (bool try_optimization)
 {
         bool generic_mix_functions = true;
 
+
 	if (try_optimization) {
 
 #if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
 	
-		unsigned int use_sse = 0;
+		unsigned long use_sse = 0;
 
 #ifndef USE_X86_64_ASM
-		asm volatile (
+		asm (
 				 "mov $1, %%eax\n"
 				 "pushl %%ebx\n"
 				 "cpuid\n"
-				 "popl %%ebx\n"
-				 "andl $33554432, %%edx\n"
 				 "movl %%edx, %0\n"
-		 	     : "=m" (use_sse)
+				 "popl %%ebx\n"
+		 	     : "=l" (use_sse)
 	   		     : 
  	    		 : "%eax", "%ecx", "%edx", "memory");
+
 #else
 
-		asm volatile (
-				 "movq $1, %%rax\n"
+		asm (
 				 "pushq %%rbx\n"
+				 "movq $1, %%rax\n"
 				 "cpuid\n"
-				 "popq %%rbx\n"
-				 "andq $33554432, %%rdx\n"
 				 "movq %%rdx, %0\n"
-		 	     : "=m" (use_sse)
+				 "popq %%rbx\n"
+		 	     : "=l" (use_sse)
 	   		     : 
- 	    		 : "%rax", "%rcx", "%rdx", "memory");
+			 : "%rax", "%rcx", "%rdx", "memory");
 
 #endif /* USE_X86_64_ASM */
+		use_sse &= (1 << 25); // bit 25 = SSE support
 		
 		if (use_sse) {
 			info << "Using SSE optimized routines" << endmsg;
 	
 			// SSE SET
-			Session::compute_peak 			= x86_sse_compute_peak;
+			Session::compute_peak 		= x86_sse_compute_peak;
 			Session::apply_gain_to_buffer 	= x86_sse_apply_gain_to_buffer;
 			Session::mix_buffers_with_gain 	= x86_sse_mix_buffers_with_gain;
 			Session::mix_buffers_no_gain 	= x86_sse_mix_buffers_no_gain;
diff --git a/libs/ardour/osc.cc b/libs/ardour/osc.cc
index c43f254f6f..933fba8740 100644
--- a/libs/ardour/osc.cc
+++ b/libs/ardour/osc.cc
@@ -199,10 +199,15 @@ OSC::init_osc_thread ()
 		return false;
 	}
 	
-	pthread_create (&_osc_thread, NULL, &OSC::_osc_receiver, this);
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+	pthread_attr_setstacksize(&attr, 500000);
+
+	pthread_create (&_osc_thread, &attr, &OSC::_osc_receiver, this);
 	if (!_osc_thread) {
 		return false;
 	}
+	pthread_attr_destroy(&attr);
 
 	//pthread_detach (_osc_thread);
 	return true;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 6ad8f7dbd2..eb9e1c69ca 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1671,6 +1671,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 	string port;
 	RouteList new_routes;
 	list<boost::shared_ptr<AudioTrack> > ret;
+	uint32_t control_id;
 
 	/* count existing audio tracks */
 
@@ -1694,6 +1695,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
 	_engine.get_physical_outputs (physoutputs);
 	_engine.get_physical_inputs (physinputs);
+	control_id = 0;
 
 	while (how_many) {
 
@@ -1782,7 +1784,8 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 			}
 			
 			track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
-			track->set_remote_control_id (ntracks());
+			track->set_remote_control_id (ntracks() + control_id + 1);
+			++control_id;
 
 			new_routes.push_back (track);
 			ret.push_back (track);
diff --git a/libs/pbd/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index 70e231e717..bf26a6f685 100644
--- a/libs/pbd/pbd/xml++.h
+++ b/libs/pbd/pbd/xml++.h
@@ -95,8 +95,11 @@ public:
 
   const XMLPropertyList & properties() const { return _proplist; };
   XMLProperty *property(const char * );
+  XMLProperty *property(const std::string&);
   const XMLProperty *property(const char * n) const
 	{ return ((XMLNode *) this)->property(n); };
+  const XMLProperty *property(const std::string& ns) const
+	{ return ((XMLNode *) this)->property(ns); };
   XMLProperty *add_property(const char *, const string &);
   XMLProperty *add_property(const char *, const char * = "");
 
diff --git a/libs/pbd/pthread_utils.cc b/libs/pbd/pthread_utils.cc
index db242cea7b..3408f2c0b7 100644
--- a/libs/pbd/pthread_utils.cc
+++ b/libs/pbd/pthread_utils.cc
@@ -43,6 +43,16 @@ pthread_create_and_store (string name, pthread_t  *thread, pthread_attr_t *attr,
 {
 	int ret;
 
+	pthread_attr_t default_attr;
+	bool use_default_attr = (attr == NULL);
+	
+	if (use_default_attr) {
+		// set default stack size to sensible default for memlocking
+		pthread_attr_init(&default_attr);
+		pthread_attr_setstacksize(&default_attr, 500000);
+		attr = &default_attr;
+	}
+
 	if ((ret = pthread_create (thread, attr, start_routine, arg)) == 0) {
 		std::pair<string,pthread_t> newpair;
 		newpair.first = name;
@@ -53,6 +63,10 @@ pthread_create_and_store (string name, pthread_t  *thread, pthread_attr_t *attr,
 
 		pthread_mutex_unlock (&thread_map_lock);
 	}
+
+	if (use_default_attr) {
+		pthread_attr_destroy(&default_attr);
+	}
 	
 	return ret;
 }
diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc
index 8d783d59f2..5507f658e9 100644
--- a/libs/pbd/xml++.cc
+++ b/libs/pbd/xml++.cc
@@ -289,11 +289,25 @@ XMLProperty *
 XMLNode::property(const char * n)
 {
 	string ns(n);
-	if (_propmap.find(ns) == _propmap.end()) {
-		return 0;
+	map<string,XMLProperty*>::iterator iter;
+
+	if ((iter = _propmap.find(ns)) != _propmap.end()) {
+		return iter->second;
+	}
+
+	return 0;
+}
+
+XMLProperty *
+XMLNode::property(const string & ns)
+{
+	map<string,XMLProperty*>::iterator iter;
+
+	if ((iter = _propmap.find(ns)) != _propmap.end()) {
+		return iter->second;
 	}
 	
-	return _propmap[ns];
+	return 0;
 }
 
 XMLProperty *