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/delivery.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/delivery.h')
-rw-r--r-- | libs/ardour/ardour/delivery.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 1b1a217466..7a5931c5fb 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -20,6 +20,7 @@ #define __ardour_delivery_h__ #include <string> + #include "ardour/types.h" #include "ardour/chan_count.h" #include "ardour/io_processor.h" @@ -31,7 +32,8 @@ class IO; class MuteMaster; class Panner; -class Delivery : public IOProcessor { +class Delivery : public IOProcessor +{ public: enum Role { /* main outputs - delivers out-of-place to port buffers, and cannot be removed */ @@ -83,9 +85,9 @@ public: BufferSet& output_buffers() { return *_output_buffers; } - sigc::signal<void> MuteChange; + boost::signals2::signal<void()> MuteChange; - static sigc::signal<void,nframes_t> CycleStart; + static boost::signals2::signal<void(nframes_t)> CycleStart; XMLNode& state (bool full); int set_state (const XMLNode&, int version); @@ -118,10 +120,10 @@ public: boost::shared_ptr<Panner> _panner; static bool panners_legal; - static sigc::signal<int> PannersLegal; + static boost::signals2::signal<int()> PannersLegal; int panners_became_legal (); - sigc::connection panner_legal_c; + boost::signals2::scoped_connection panner_legal_c; void output_changed (IOChange, void*); gain_t target_gain (); |