X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_grid.h;h=ec7eb32b4bee90d4b571fd8559ee0d10468a4a00;hb=957c0aec4fcb4f4e44d7eedcb2942326c52d69cd;hp=7172b82699ab95add95782e52cfc5ac8dfe6ccea;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_grid.h b/gtk2_ardour/port_matrix_grid.h
index 7172b82699..ec7eb32b4b 100644
--- a/gtk2_ardour/port_matrix_grid.h
+++ b/gtk2_ardour/port_matrix_grid.h
@@ -41,15 +41,15 @@ class PortMatrixGrid : public PortMatrixComponent
 public:
 	PortMatrixGrid (PortMatrix *, PortMatrixBody *);
 
-	void button_press (double, double, int, uint32_t);
-	void button_release (double, double, int, uint32_t);
+	void button_press (double, double, int, uint32_t, guint);
+	void button_release (double, double, int, uint32_t, guint);
 	void motion (double, double);
 
 	double component_to_parent_x (double x) const;
 	double parent_to_component_x (double x) const;
 	double component_to_parent_y (double y) const;
 	double parent_to_component_y (double y) const;
-	void mouseover_changed (PortMatrixNode const &);
+	void mouseover_changed (std::list<PortMatrixNode> const &);
 	void draw_extra (cairo_t *);
 
 private:
@@ -58,13 +58,12 @@ private:
 	void render (cairo_t *);
 	void render_group_pair (cairo_t *, boost::shared_ptr<const PortGroup>, boost::shared_ptr<const PortGroup>, uint32_t, uint32_t);
 
-	PortMatrixNode position_to_node (uint32_t, uint32_t) const;
-	void queue_draw_for (PortMatrixNode const &);
+	PortMatrixNode position_to_node (double, double) const;
+	void queue_draw_for (std::list<PortMatrixNode> const &);
 	void draw_association_indicator (cairo_t *, uint32_t, uint32_t, double p = 1);
 	void draw_empty_square (cairo_t *, uint32_t, uint32_t);
-	void draw_unknown_indicator (cairo_t *, uint32_t, uint32_t);
+	void draw_non_connectable_indicator (cairo_t *, uint32_t, uint32_t);
 	std::list<PortMatrixNode> nodes_on_line (int, int, int, int) const;
-	PortMatrixNode::State get_association (PortMatrixNode) const;
 	void set_association (PortMatrixNode, bool);
 	bool toggle_state (PortMatrixNode::State) const;