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/delivery.cc | |
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/delivery.cc')
-rw-r--r-- | libs/ardour/delivery.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 07489687c1..7f159a441c 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -42,9 +42,9 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -sigc::signal<void,nframes_t> Delivery::CycleStart; -sigc::signal<int> Delivery::PannersLegal; -bool Delivery::panners_legal = false; +boost::signals2::signal<void(nframes_t)> Delivery::CycleStart; +boost::signals2::signal<int()> Delivery::PannersLegal; +bool Delivery::panners_legal = false; /* deliver to an existing IO object */ @@ -64,10 +64,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Mute _display_to_user = false; if (_output) { - _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); + scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); } - CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); + scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); } /* deliver to a new IO object */ @@ -88,10 +88,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const string& _display_to_user = false; if (_output) { - _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); + scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); } - CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); + scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); } /* deliver to a new IO object, reconstruct from XML */ @@ -116,10 +116,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& } if (_output) { - _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); + scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); } - CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); + scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); } /* deliver to an existing IO object, reconstruct from XML */ @@ -144,10 +144,10 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> out, boost::shared_ptr<Mut } if (_output) { - _output->changed.connect (sigc::mem_fun (*this, &Delivery::output_changed)); + scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); } - CycleStart.connect (sigc::mem_fun (*this, &Delivery::cycle_start)); + scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); } std::string @@ -419,7 +419,7 @@ Delivery::reset_panner () } } else { panner_legal_c.disconnect (); - panner_legal_c = PannersLegal.connect (sigc::mem_fun (*this, &Delivery::panners_became_legal)); + panner_legal_c = PannersLegal.connect (boost::bind (&Delivery::panners_became_legal, this)); } } @@ -465,7 +465,7 @@ int Delivery::reset_panners () { panners_legal = true; - return PannersLegal (); + return *PannersLegal (); } |