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/ardour/io.h | |
| 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/ardour/io.h')
| -rw-r--r-- | libs/ardour/ardour/io.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index eeb7ed64f0..b718cfa5c9 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -132,7 +132,7 @@ class IO : public SessionObject, public Latent const ChanCount& n_ports () const { return _ports.count(); } - boost::signals2::signal<void(IOChange,void*)> changed; + PBD::Signal2<void,IOChange,void*> changed; virtual XMLNode& state (bool full); XMLNode& get_state (void); @@ -144,7 +144,7 @@ class IO : public SessionObject, public Latent static int disable_ports (void); static int enable_ports (void); - static boost::signals2::signal<void(ChanCount)> PortCountChanged; // emitted when the number of ports changes + static PBD::Signal1<void,ChanCount> PortCountChanged; // emitted when the number of ports changes static std::string name_from_state (const XMLNode&); static void set_name_in_state (XMLNode&, const std::string&); @@ -152,7 +152,7 @@ class IO : public SessionObject, public Latent /* we have to defer/order port connection. this is how we do it. */ - static boost::signals2::signal<int()> ConnectingLegal; + static PBD::Signal0<int> ConnectingLegal; static bool connecting_legal; XMLNode *pending_state_node; @@ -180,14 +180,14 @@ class IO : public SessionObject, public Latent private: int connecting_became_legal (); - boost::signals2::scoped_connection connection_legal_c; + PBD::ScopedConnection connection_legal_c; boost::shared_ptr<Bundle> _bundle; ///< a bundle representing our ports struct UserBundleInfo { UserBundleInfo (IO*, boost::shared_ptr<UserBundle> b); boost::shared_ptr<UserBundle> bundle; - boost::signals2::scoped_connection changed; + PBD::ScopedConnection changed; }; std::vector<UserBundleInfo*> _bundles_connected; ///< user bundles connected to our ports |