X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_component.h;h=0b472e157ddc48fb57efa111de14260455aa34da;hb=d0553753af291507823737b2c17cdb8128494f96;hp=6a867f16e95efefb832185c87767be1a4b2df57b;hpb=f2dbcec61d22f6e5aa483c9c787b660e691f85ad;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h
index 6a867f16e9..0b472e157d 100644
--- a/gtk2_ardour/port_matrix_component.h
+++ b/gtk2_ardour/port_matrix_component.h
@@ -31,6 +31,7 @@ class PortGroup;
 class PortGroupList;
 
 namespace ARDOUR {
+	class Bundle;
 	class BundleChannel;
 }
 
@@ -49,7 +50,8 @@ public:
 	virtual double parent_to_component_y (double y) const = 0;
 	virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
 	virtual void draw_extra (cairo_t *) = 0;
-	virtual void button_press (double, double, int, uint32_t) {}
+	virtual void button_press (double, double, GdkEventButton *) {}
+	virtual void button_release (double, double, GdkEventButton *) {}
 	virtual void motion (double, double) {}
 
 	void set_show_ports (bool);
@@ -136,7 +138,7 @@ protected:
 	}
 
 	/** @return colour to paint grid squares when they can't be associated */
-	static Gdk::Color unknown_colour () {
+	static Gdk::Color non_connectable_colour () {
 		return Gdk::Color ("#cccccc");
 	}
 
@@ -153,9 +155,9 @@ protected:
 	/* XXX */
 	static Gdk::Color get_a_bundle_colour (int x) {
 		if ((x % 2) == 0) {
-			return Gdk::Color ("#547027");
+			return Gdk::Color ("#555555");
 		} else {
-			return Gdk::Color ("#3552a6");
+			return Gdk::Color ("#666666");
 		}
 	}
 
@@ -171,8 +173,8 @@ protected:
 	void set_source_rgb (cairo_t *, Gdk::Color const &);
 	void set_source_rgba (cairo_t *, Gdk::Color const &, double);
 	uint32_t group_size (boost::shared_ptr<const PortGroup>) const;
-	uint32_t channel_to_position (ARDOUR::BundleChannel, PortGroupList const *) const;
-	virtual std::pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> position_to_group_and_channel (double, double, PortGroupList const *) const;
+	uint32_t channel_to_position (ARDOUR::BundleChannel, boost::shared_ptr<const PortGroup>) const;
+	virtual ARDOUR::BundleChannel position_to_channel (double, double, boost::shared_ptr<const PortGroup>) const;
 
 	/** Render the complete component to a cairo context. */
 	virtual void render (cairo_t *) = 0;