3 files changed, 7 insertions, 2 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 6d67e0f793..383ec73531 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -45,7 +45,7 @@ class AudioPlaylist : public ARDOUR::Playlist
 	AudioPlaylist (const AudioPlaylist&, string name, bool hidden = false);
 	AudioPlaylist (const AudioPlaylist&, nframes_t start, nframes_t cnt, string name, bool hidden = false);
 
-	void clear ();
+	void clear (bool with_signals=true);
 
         nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index d1b2e8f1e1..d29ba47056 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -108,6 +108,8 @@ class Crossfade : public PBD::StatefulDestructible
 	nframes_t overlap_length() const;
 	nframes_t position() const { return _position; }
 
+	void invalidate();
+
 	sigc::signal<void,Crossfade*> Invalidated;
 	sigc::signal<void,Change>     StateChanged;
 
@@ -135,6 +137,7 @@ class Crossfade : public PBD::StatefulDestructible
 	static void set_short_xfade_length (nframes_t n);
 
 	static Change ActiveChanged;
+	static Change FollowOverlapChanged;
 
   private:
 	friend struct CrossfadeComparePtr;
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 8f08c58466..2d19f661c4 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -55,7 +55,7 @@ class Playlist : public PBD::StatefulDestructible {
 	Playlist (const Playlist&, string name, bool hidden = false);
 	Playlist (const Playlist&, nframes_t start, nframes_t cnt, string name, bool hidden = false);
 
-	virtual void clear ();
+	virtual void clear (bool with_signals=true);
 	virtual void dump () const;
 
 	void ref();
@@ -171,6 +171,8 @@ class Playlist : public PBD::StatefulDestructible {
 	mutable gint    block_notifications;
 	mutable gint    ignore_state_changes;
 	mutable Glib::Mutex region_lock;
+	std::set<boost::shared_ptr<Region> > pending_adds;
+	std::set<boost::shared_ptr<Region> > pending_removes;
 	RegionList       pending_bounds;
 	bool             pending_modified;
 	bool             pending_length;