X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.h;h=f0bb1c4c58ef0c57f62393042a43297555992009;hb=b461bc1dc1970a9e147c43a721d3155f6215f8c7;hp=17d1963e1908632a9d576dee907ad8ae57794267;hpb=8e59a26ccf13de93ac681d761bad09cd6bcf0c90;p=ardour.git

diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index 17d1963e19..f0bb1c4c58 100644
--- a/gtk2_ardour/port_group.h
+++ b/gtk2_ardour/port_group.h
@@ -40,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.
@@ -58,7 +57,7 @@ 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 ();
 
@@ -76,7 +75,7 @@ public:
 	    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; 
+	    boost::weak_ptr<ARDOUR::IO> io; 
 	    Gdk::Color colour;
 	    bool has_colour;
 	    PBD::ScopedConnection changed_connection;
@@ -108,12 +107,11 @@ class PortGroupList : public sigc::trackable
 
 	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);
 	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();
 	}
@@ -144,12 +142,12 @@ 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) 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> > &
 		);
+	boost::shared_ptr<ARDOUR::Bundle> bundle_for_type (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType) const;
 
-	ARDOUR::DataType _type;
 	mutable PortGroup::BundleList _bundles;
 	List _groups;
 	PBD::ScopedConnectionList _bundle_changed_connections;