X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcrossfade.h;h=5e25bbe00db436a2cdb356909f6b095bf77593ef;hb=9e0d03020ff47773f7d1c0414de1c74e6c9e0dac;hp=577bee8257d911f6d8c71816a6d8f37194c853d8;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index 577bee8257..5e25bbe00d 100644 --- a/libs/ardour/ardour/crossfade.h +++ b/libs/ardour/ardour/crossfade.h @@ -24,7 +24,6 @@ #include #include -#include #include "pbd/undo.h" #include "pbd/statefuldestructible.h" @@ -75,7 +74,7 @@ class Crossfade : public ARDOUR::AudioRegion bool operator== (const ARDOUR::Crossfade&); XMLNode& get_state (void); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version); boost::shared_ptr in() const { return _in; } boost::shared_ptr out() const { return _out; } @@ -106,8 +105,8 @@ class Crossfade : public ARDOUR::AudioRegion nframes_t overlap_length() const; - sigc::signal > Invalidated; - sigc::signal StateChanged; + PBD::Signal1 > Invalidated; + PBD::Signal1 StateChanged; bool covers (nframes_t frame) const { return _position <= frame && frame < _position + _length;