diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-19 20:26:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-19 20:26:31 +0000 |
| commit | aae367b63c9b619db1e40f27dc334c6987219481 (patch) | |
| tree | 142f6ffed6bb749e24a06343587cad6b966888bd /libs/ardour/delivery.cc | |
| parent | 67460c2af45d0455e64623572480c064445c2e5b (diff) | |
use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 7f159a441c..1438f93722 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -42,8 +42,8 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -boost::signals2::signal<void(nframes_t)> Delivery::CycleStart; -boost::signals2::signal<int()> Delivery::PannersLegal; +PBD::Signal1<void,nframes_t> Delivery::CycleStart; +PBD::Signal0<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) { - scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); + _output->changed.connect (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); + CycleStart.connect (*this, 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) { - scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); + _output->changed.connect (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); + CycleStart.connect (*this, 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) { - scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); + _output->changed.connect (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); + CycleStart.connect (*this, 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) { - scoped_connect (_output->changed, boost::bind (&Delivery::output_changed, this, _1, _2)); + _output->changed.connect (*this, boost::bind (&Delivery::output_changed, this, _1, _2)); } - scoped_connect (CycleStart, boost::bind (&Delivery::cycle_start, this, _1)); + CycleStart.connect (*this, 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 (boost::bind (&Delivery::panners_became_legal, this)); + PannersLegal.connect (panner_legal_c, boost::bind (&Delivery::panners_became_legal, this)); } } |