X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.h;h=a9dfc1a4addad8480800999458f6aecd39d4fd59;hb=2d0309c09289ec014bd4fa847da4eee3dc92babd;hp=f8955337a2596208c1f8b7780c188f55e2d5b24a;hpb=5f67a72c341a96872d9cd3d1de357662295d14b0;p=ardour.git

diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index f8955337a2..a9dfc1a4ad 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.
@@ -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,7 +107,7 @@ class PortGroupList : public sigc::trackable
 
 	void add_group (boost::shared_ptr<PortGroup>);
 	void add_group_if_not_empty (boost::shared_ptr<PortGroup>);
-	void gather (ARDOUR::Session *, ARDOUR::DataType, 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>);
@@ -145,7 +144,7 @@ class PortGroupList : public sigc::trackable
 	void emit_bundle_changed (ARDOUR::Bundle::Change);
 	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> > &
 		);
 
 	mutable PortGroup::BundleList _bundles;