allow sending OSC from inline display UIs

[ardour.git] / gtk2_ardour / port_group.h

diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index 3ae1df697d4f0928e5b9e6a48ba553345a4e85ee..d631f8ac0515d9ea180f1236a5f2f02b831e7509 100644 (file)
--- a/gtk2_ardour/port_group.h
+++ b/gtk2_ardour/port_group.h
@@ -75,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;
@@ -107,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>);
@@ -142,11 +142,10 @@ 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 &, ARDOUR::DataType, 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::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;
 
        mutable PortGroup::BundleList _bundles;
        List _groups;