X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.h;h=17d1963e1908632a9d576dee907ad8ae57794267;hb=a4664d68c031c77c5e436fe97a92005b7d2019d8;hp=ebab997699d2a8b07b4bd684a2c4d70db9017175;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h index ebab997699..17d1963e19 100644 --- a/gtk2_ardour/port_group.h +++ b/gtk2_ardour/port_group.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include "pbd/signals.h" #include #include @@ -60,16 +60,17 @@ public: void clear (); uint32_t total_channels () const; boost::shared_ptr io_from_bundle (boost::shared_ptr) const; + void remove_duplicates (); std::string name; ///< name for the group bool has_port (std::string const &) const; /** The bundle list has changed in some way; a bundle has been added or removed, or the list cleared etc. */ - sigc::signal Changed; + PBD::Signal0 Changed; /** An individual bundle on our list has changed in some way */ - boost::signals2::signal BundleChanged; + PBD::Signal1 BundleChanged; struct BundleRecord { boost::shared_ptr bundle; @@ -78,7 +79,7 @@ public: boost::shared_ptr io; Gdk::Color colour; bool has_colour; - boost::signals2::scoped_connection changed_connection; + PBD::ScopedConnection changed_connection; BundleRecord (boost::shared_ptr, boost::shared_ptr, Gdk::Color, bool has_colour); }; @@ -132,10 +133,10 @@ class PortGroupList : public sigc::trackable bool empty () const; /** The group list has changed in some way; a group has been added or removed, or the list cleared etc. */ - boost::signals2::signal Changed; + PBD::Signal0 Changed; /** A bundle in one of our groups has changed */ - boost::signals2::signal BundleChanged; + PBD::Signal1 BundleChanged; private: bool port_has_prefix (std::string const &, std::string const &) const; @@ -152,6 +153,7 @@ class PortGroupList : public sigc::trackable mutable PortGroup::BundleList _bundles; List _groups; PBD::ScopedConnectionList _bundle_changed_connections; + PBD::ScopedConnectionList _changed_connections; bool _signals_suspended; bool _pending_change; ARDOUR::Bundle::Change _pending_bundle_change;