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/pbd/controllable.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/pbd/controllable.cc')
| -rw-r--r-- | libs/pbd/controllable.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 369e2bd545..dd0dfd4445 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -26,15 +26,16 @@ using namespace PBD; using namespace std; -boost::signals2::signal<void(Controllable*)> Controllable::Destroyed; -boost::signals2::signal<bool(Controllable*)> Controllable::StartLearning; -boost::signals2::signal<void(Controllable*)> Controllable::StopLearning; -boost::signals2::signal<void(Controllable*,int,int)> Controllable::CreateBinding; -boost::signals2::signal<void(Controllable*)> Controllable::DeleteBinding; +PBD::Signal1<void,Controllable*> Controllable::Destroyed; +PBD::Signal1<bool,Controllable*> Controllable::StartLearning; +PBD::Signal1<void,Controllable*> Controllable::StopLearning; +PBD::Signal3<void,Controllable*,int,int> Controllable::CreateBinding; +PBD::Signal1<void,Controllable*> Controllable::DeleteBinding; Glib::StaticRWLock Controllable::registry_lock = GLIBMM_STATIC_RW_LOCK_INIT; Controllable::Controllables Controllable::registry; Controllable::ControllablesByURI Controllable::registry_by_uri; +PBD::ScopedConnectionList registry_connections; Controllable::Controllable (const string& name, const string& uri) : _name (name) @@ -61,7 +62,7 @@ Controllable::add (Controllable& ctl) /* Controllable::remove() is static - no need to manage this connection */ - ctl.GoingAway.connect (boost::bind (&Controllable::remove, ref (ctl))); + ctl.GoingAway.connect (registry_connections, boost::bind (&Controllable::remove, ref (ctl))); } void |