X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcrossfade.h;h=7346e645fb136e8fbf795258ab2ec597eebe6ff3;hb=09d6a963216ded5c47adc911c546fb280b8ac89e;hp=d29ba47056f2e4bf8c8854ce3b85e258d81bfdf2;hpb=3e8be2ca624575d7578c405e6df1bfffd4b34fae;p=ardour.git

diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index d29ba47056..7346e645fb 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -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$
 */
 
 #ifndef __ardour_overlap_h__
@@ -24,6 +23,7 @@
 #include <vector>
 #include <algorithm>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 #include <sigc++/signal.h>
 
@@ -40,7 +40,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:
 
@@ -64,12 +64,13 @@ class Crossfade : public PBD::StatefulDestructible
 
 
 	/* copy constructor to copy a crossfade with new regions. used (for example)
-	   when a playlist copy is made */
+	   when a playlist copy is made 
+	*/
 	Crossfade (const Crossfade &, boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>);
 	
 	/* the usual XML constructor */
 
-	Crossfade (const ARDOUR::Playlist&, XMLNode&);
+	Crossfade (const Playlist&, XMLNode&);
 	virtual ~Crossfade();
 
 	bool operator== (const ARDOUR::Crossfade&);
@@ -110,7 +111,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 {
@@ -155,6 +156,7 @@ class Crossfade : public PBD::StatefulDestructible
 	AnchorPoint          _anchor_point;
 	bool                 _follow_overlap;
 	bool                 _fixed;
+	int32_t               layer_relation;
 	Curve _fade_in;
 	Curve _fade_out;
 
@@ -163,9 +165,7 @@ class Crossfade : public PBD::StatefulDestructible
 
 	void initialize ();
 	int  compute (boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>, CrossfadeModel);
-	bool update (bool force);
-
-	void member_changed (ARDOUR::Change);
+	bool update ();
 };