X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.h;h=d631f8ac0515d9ea180f1236a5f2f02b831e7509;hb=004b57e9f67c6b818357759005c8e53b041dead4;hp=1fcceb4c192fbecc80f1aa42b544db3d18c4ce33;hpb=abd80d0f64a4b32c3a8cce01c9aa1d6bc7ee64bb;p=ardour.git

diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index 1fcceb4c19..d631f8ac05 100644
--- a/gtk2_ardour/port_group.h
+++ b/gtk2_ardour/port_group.h
@@ -23,9 +23,12 @@
 #include <vector>
 #include <string>
 #include <set>
+#include <boost/shared_ptr.hpp>
+#include "pbd/signals.h"
+
 #include <gtkmm/widget.h>
 #include <gtkmm/checkbutton.h>
-#include <boost/shared_ptr.hpp>
+
 #include "ardour/data_type.h"
 #include "ardour/types.h"
 
@@ -37,7 +40,6 @@ namespace ARDOUR {
 }
 
 class PortMatrix;
-class RouteBundle;
 class PublicEditor;
 
 /** A list of bundles grouped by some aspect of their type e.g. busses, tracks, system.
@@ -47,6 +49,7 @@ class PortGroup : public sigc::trackable
 {
 public:
 	PortGroup (std::string const & n);
+	~PortGroup ();
 
 	void add_bundle (boost::shared_ptr<ARDOUR::Bundle>, bool allow_dups = false);
 	void add_bundle (boost::shared_ptr<ARDOUR::Bundle>, boost::shared_ptr<ARDOUR::IO> io);
@@ -54,30 +57,33 @@ public:
 	void remove_bundle (boost::shared_ptr<ARDOUR::Bundle>);
 	boost::shared_ptr<ARDOUR::Bundle> only_bundle ();
 	void clear ();
-	uint32_t total_channels () const;
+	ARDOUR::ChanCount total_channels () const;
 	boost::shared_ptr<ARDOUR::IO> io_from_bundle (boost::shared_ptr<ARDOUR::Bundle>) 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<void> Changed;
+	PBD::Signal0<void> Changed;
 
 	/** An individual bundle on our list has changed in some way */
-	sigc::signal<void, ARDOUR::Bundle::Change> BundleChanged;
+	PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
 
 	struct BundleRecord {
-		boost::shared_ptr<ARDOUR::Bundle> bundle;
-		/** IO whose ports are in the bundle, or 0.  This is so that we can do things like adding
-		    ports to the IO from matrix editor menus. */
-		boost::shared_ptr<ARDOUR::IO> io; 
-		Gdk::Color colour;
-		bool has_colour;
-		sigc::connection changed_connection;
+	    boost::shared_ptr<ARDOUR::Bundle> bundle;
+	    /** IO whose ports are in the bundle, or 0.  This is so that we can do things like adding
+		ports to the IO from matrix editor menus. */
+	    boost::weak_ptr<ARDOUR::IO> io;
+	    Gdk::Color colour;
+	    bool has_colour;
+	    PBD::ScopedConnection changed_connection;
+
+	    BundleRecord (boost::shared_ptr<ARDOUR::Bundle>, boost::shared_ptr<ARDOUR::IO>, Gdk::Color, bool has_colour);
 	};
 
-	typedef std::list<BundleRecord> BundleList;
+	typedef std::list<BundleRecord*> BundleList;
 
 	BundleList const & bundles () const {
 		return _bundles;
@@ -95,17 +101,17 @@ class PortGroupList : public sigc::trackable
 {
   public:
 	PortGroupList ();
+	~PortGroupList();
 
 	typedef std::vector<boost::shared_ptr<PortGroup> > List;
 
 	void add_group (boost::shared_ptr<PortGroup>);
 	void add_group_if_not_empty (boost::shared_ptr<PortGroup>);
-	void set_type (ARDOUR::DataType);
-	void gather (ARDOUR::Session *, bool, bool);
+	void gather (ARDOUR::Session *, ARDOUR::DataType, bool, bool, bool);
 	PortGroup::BundleList const & bundles () const;
 	void clear ();
 	void remove_bundle (boost::shared_ptr<ARDOUR::Bundle>);
-	uint32_t total_channels () const;
+	ARDOUR::ChanCount total_channels () const;
 	uint32_t size () const {
 		return _groups.size();
 	}
@@ -125,10 +131,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. */
-	sigc::signal<void> Changed;
+	PBD::Signal0<void> Changed;
 
 	/** A bundle in one of our groups has changed */
-	sigc::signal<void, ARDOUR::Bundle::Change> BundleChanged;
+	PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
 
   private:
 	bool port_has_prefix (std::string const &, std::string const &) const;
@@ -136,15 +142,15 @@ class PortGroupList : public sigc::trackable
 	std::string common_prefix_before (std::vector<std::string> const &, std::string const &) const;
 	void emit_changed ();
 	void emit_bundle_changed (ARDOUR::Bundle::Change);
-	boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, bool) const;
+	boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, ARDOUR::DataType, bool, std::string const& bundle_name = std::string()) const;
 	void maybe_add_processor_to_list (
-		boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::Bundle> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
+		boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
 		);
 
-	ARDOUR::DataType _type;
 	mutable PortGroup::BundleList _bundles;
 	List _groups;
-	std::vector<sigc::connection> _bundle_changed_connections;
+	PBD::ScopedConnectionList _bundle_changed_connections;
+	PBD::ScopedConnectionList _changed_connections;
 	bool _signals_suspended;
 	bool _pending_change;
 	ARDOUR::Bundle::Change _pending_bundle_change;