projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
assert() to help find some possible causes of #2991. Fix some confusion with GTK...
[ardour.git]
/
libs
/
ardour
/
ardour
/
crossfade.h
diff --git
a/libs/ardour/ardour/crossfade.h
b/libs/ardour/ardour/crossfade.h
index 577bee8257d911f6d8c71816a6d8f37194c853d8..5e25bbe00db436a2cdb356909f6b095bf77593ef 100644
(file)
--- a/
libs/ardour/ardour/crossfade.h
+++ b/
libs/ardour/ardour/crossfade.h
@@
-24,7
+24,6
@@
#include <algorithm>
#include <boost/shared_ptr.hpp>
#include <algorithm>
#include <boost/shared_ptr.hpp>
-#include <sigc++/signal.h>
#include "pbd/undo.h"
#include "pbd/statefuldestructible.h"
#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);
bool operator== (const ARDOUR::Crossfade&);
XMLNode& get_state (void);
- int set_state (const XMLNode&);
+ int set_state (const XMLNode&
, int version
);
boost::shared_ptr<ARDOUR::AudioRegion> in() const { return _in; }
boost::shared_ptr<ARDOUR::AudioRegion> out() const { return _out; }
boost::shared_ptr<ARDOUR::AudioRegion> in() const { return _in; }
boost::shared_ptr<ARDOUR::AudioRegion> out() const { return _out; }
@@
-106,8
+105,8
@@
class Crossfade : public ARDOUR::AudioRegion
nframes_t overlap_length() const;
nframes_t overlap_length() const;
-
sigc::signal
<void,boost::shared_ptr<Region> > Invalidated;
-
sigc::signal
<void,Change> StateChanged;
+
PBD::Signal1
<void,boost::shared_ptr<Region> > Invalidated;
+
PBD::Signal1
<void,Change> StateChanged;
bool covers (nframes_t frame) const {
return _position <= frame && frame < _position + _length;
bool covers (nframes_t frame) const {
return _position <= frame && frame < _position + _length;