Improvements to the port matrix (I think). Sizing of the cairo section should be better. Clicking on nodes performs port connects / disconnects.

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

1 files changed, 14 insertions, 4 deletions

diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index f20c88055f..27f295b89d 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -42,7 +42,7 @@ class PortMatrix : public Gtk::VBox {
 	PortMatrix (ARDOUR::Session&, ARDOUR::DataType, bool, PortGroupList::Mask);
 	~PortMatrix ();
 
-	void redisplay ();
+	void setup ();
 
 	enum Result {
 		Cancelled,
@@ -55,8 +55,19 @@ class PortMatrix : public Gtk::VBox {
 	void set_offer_inputs (bool);
 	bool offering_input() const { return _offer_inputs; }
 
-	virtual void set_state (int, std::string const &, bool, uint32_t) = 0;
-	virtual bool get_state (int, std::string const &) const = 0;
+	/** @param r Our row index.
+	 *  @param p Other port.
+	 *  @param s New state.
+	 *  @param k XXX
+	 */
+	virtual void set_state (int r, std::string const & p, bool s, uint32_t k) = 0;
+
+	/** @param r Our row index.
+	 *  @param p Other port.
+	 *  @return true if r is connected to p, otherwise false.
+	 */
+	virtual bool get_state (int r, std::string const &p) const = 0;
+	
 	virtual uint32_t n_rows () const = 0;
 	virtual uint32_t maximum_rows () const = 0;
 	virtual uint32_t minimum_rows () const = 0;
@@ -86,7 +97,6 @@ class PortMatrix : public Gtk::VBox {
 	Gtk::Label* _side_vbox_pad;
 	Gtk::HBox _visibility_checkbutton_box;
 
-	void setup ();
 	void clear ();
 	bool row_label_button_pressed (GdkEventButton*, int);
 	void reset_visibility ();