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/location.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/location.h')
-rw-r--r-- | libs/ardour/ardour/location.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 149a559d85..b50a645a93 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -26,7 +26,6 @@ #include <map> #include <sys/types.h> -#include <sigc++/signal.h> #include <glibmm/thread.h> @@ -109,15 +108,15 @@ class Location : public PBD::StatefulDestructible bool is_range_marker() const { return _flags & IsRangeMarker; } bool matches (Flags f) const { return _flags & f; } - sigc::signal<void,Location*> name_changed; - sigc::signal<void,Location*> end_changed; - sigc::signal<void,Location*> start_changed; + boost::signals2::signal<void(Location*)> name_changed; + boost::signals2::signal<void(Location*)> end_changed; + boost::signals2::signal<void(Location*)> start_changed; - sigc::signal<void,Location*,void*> FlagsChanged; + boost::signals2::signal<void(Location*,void*)> FlagsChanged; /* this is sent only when both start&end change at the same time */ - sigc::signal<void,Location*> changed; + boost::signals2::signal<void(Location*)> changed; /* CD Track / CD-Text info */ @@ -176,11 +175,11 @@ class Locations : public PBD::StatefulDestructible void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags); - sigc::signal<void,Location*> current_changed; - sigc::signal<void> changed; - sigc::signal<void,Location*> added; - sigc::signal<void,Location*> removed; - sigc::signal<void,Change> StateChanged; + boost::signals2::signal<void(Location*)> current_changed; + boost::signals2::signal<void()> changed; + boost::signals2::signal<void(Location*)> added; + boost::signals2::signal<void(Location*)> removed; + boost::signals2::signal<void(Change)> StateChanged; template<class T> void apply (T& obj, void (T::*method)(LocationList&)) { Glib::Mutex::Lock lm (lock); |