diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /libs/ardour/ardour/region.h | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/region.h')
| -rw-r--r-- | libs/ardour/ardour/region.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 7bae98e573..a276fb19ee 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -26,6 +26,7 @@ #include <boost/utility.hpp> #include "pbd/undo.h" +#include "pbd/scoped_connections.h" #include "ardour/ardour.h" #include "ardour/data_type.h" @@ -95,8 +96,8 @@ class Region static Change LayerChanged; static Change HiddenChanged; - sigc::signal<void,Change> StateChanged; - static sigc::signal<void,boost::shared_ptr<ARDOUR::Region> > RegionPropertyChanged; + boost::signals2::signal<void(Change)> StateChanged; + static boost::signals2::signal<void(boost::shared_ptr<ARDOUR::Region>)> RegionPropertyChanged; void unlock_property_changes () { _flags = Flag (_flags & ~DoNotSendPropertyChanges); } void block_property_changes () { _flags = Flag (_flags | DoNotSendPropertyChanges); } @@ -218,7 +219,7 @@ class Region boost::shared_ptr<ARDOUR::Playlist> playlist() const { return _playlist.lock(); } virtual void set_playlist (boost::weak_ptr<ARDOUR::Playlist>); - void source_deleted (boost::shared_ptr<Source>); + void source_deleted (boost::weak_ptr<Source>); boost::shared_ptr<Source> source (uint32_t n=0) const { return _sources[ (n < _sources.size()) ? n : 0 ]; } uint32_t n_channels() const { return _sources.size(); } |