Some refactoring. Add port group headers to the port matrix.

git-svn-id: svn://localhost/ardour2/branches/3.0@4443 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 14 insertions, 6 deletions

diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index ad6730976d..85a273265e 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -46,13 +46,21 @@ namespace ARDOUR {
 class PortMatrix : public Gtk::VBox
 {
 public:
-	PortMatrix (ARDOUR::Session&, ARDOUR::DataType, bool, PortGroupList::Mask);
+	PortMatrix (ARDOUR::Session&, ARDOUR::DataType, bool);
 	~PortMatrix ();
 
 	virtual void setup ();
 	void set_offer_inputs (bool);
 	void set_type (ARDOUR::DataType);
-	bool offering_input () const { return _offer_inputs; }
+
+	ARDOUR::DataType type () const {
+		return _type;
+	}
+	
+	bool offering_input () const {
+		return _offer_inputs;
+	}
+	
 	void disassociate_all ();
 
 	enum Result {
@@ -106,15 +114,15 @@ public:
 
 protected:
 
-	std::vector<boost::shared_ptr<ARDOUR::Bundle> > _our_bundles;
-	/// list of port groups
-	PortGroupList _port_group_list;
+	PortGroupList _row_ports;
+	PortGroupList _column_ports;
 	
 private:
 
 	void hscroll_changed ();
 	void vscroll_changed ();
-	
+
+	ARDOUR::Session& _session;
 	/// true to offer inputs, otherwise false
 	bool _offer_inputs;
 	/// port type that we are working with