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/io.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/io.cc')
| -rw-r--r-- | libs/ardour/io.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index b9fd9ccbc6..f47e147a18 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -67,8 +67,8 @@ using namespace PBD; const string IO::state_node_name = "IO"; bool IO::connecting_legal = false; -boost::signals2::signal<int()> IO::ConnectingLegal; -boost::signals2::signal<void(ChanCount)> IO::PortCountChanged; +PBD::Signal0<int> IO::ConnectingLegal; +PBD::Signal1<void,ChanCount> IO::PortCountChanged; /** @param default_type The type of port that will be created by ensure_io * and friends if no type is explicitly requested (to avoid breakage). @@ -566,7 +566,7 @@ IO::set_state (const XMLNode& node, int version) pending_state_node = new XMLNode (node); pending_state_node_version = version; pending_state_node_in = false; - connection_legal_c = ConnectingLegal.connect (boost::bind (&IO::connecting_became_legal, this)); + ConnectingLegal.connect (connection_legal_c, boost::bind (&IO::connecting_became_legal, this)); } @@ -619,7 +619,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) pending_state_node = new XMLNode (node); pending_state_node_version = version; pending_state_node_in = in; - connection_legal_c = ConnectingLegal.connect (boost::bind (&IO::connecting_became_legal, this)); + ConnectingLegal.connect (connection_legal_c, boost::bind (&IO::connecting_became_legal, this)); } return 0; @@ -1399,7 +1399,7 @@ IO::bundles_connected () IO::UserBundleInfo::UserBundleInfo (IO* io, boost::shared_ptr<UserBundle> b) { bundle = b; - changed = b->Changed.connect (boost::bind (&IO::bundle_changed, io, _1)); + b->Changed.connect (changed, boost::bind (&IO::bundle_changed, io, _1)); } std::string |