Add global port matrix dialogs.

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

1 files changed, 12 insertions, 7 deletions

diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index 37c05553f1..ad6730976d 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -78,13 +78,19 @@ public:
 		uint32_t k
 		) = 0;
 
+	enum State {
+		ASSOCIATED,
+		NOT_ASSOCIATED,
+		UNKNOWN
+	};
+
 	/** @param ab Our bundle.
 	 *  @param ac Channel on our bundle.
 	 *  @param bb Other bundle.
 	 *  @arapm bc Channel on other bundle.
-	 *  @return true if r is connected to p, otherwise false.
+	 *  @return state
 	 */
-	virtual bool get_state (
+	virtual State get_state (
 		boost::shared_ptr<ARDOUR::Bundle> ab,
 		uint32_t ac,
 		boost::shared_ptr<ARDOUR::Bundle> bb,
@@ -99,19 +105,18 @@ public:
 	void setup_scrollbars ();
 
 protected:
-	/// our bundle
-	boost::shared_ptr<ARDOUR::Bundle> _our_bundle;
+
+	std::vector<boost::shared_ptr<ARDOUR::Bundle> > _our_bundles;
+	/// list of port groups
+	PortGroupList _port_group_list;
 	
 private:
 
 	void hscroll_changed ();
 	void vscroll_changed ();
-	std::string common_prefix (std::vector<std::string> const &) const;
 	
 	/// true to offer inputs, otherwise false
 	bool _offer_inputs;
-	/// list of port groups
-	PortGroupList _port_group_list;
 	/// port type that we are working with
 	ARDOUR::DataType _type;