X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_component.h;h=c61d7ec67dcd1db3188c9bf201ed69f9a580dd24;hb=0013feddbf260f0b57ee74786c316739806ea47a;hp=7e5ed3d8a25ccfcd8b86c9f9ccde515961d5cdbd;hpb=91dae1fb0329b49deb74f2972418c71b0373114c;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h
index 7e5ed3d8a2..c61d7ec67d 100644
--- a/gtk2_ardour/port_matrix_component.h
+++ b/gtk2_ardour/port_matrix_component.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@ class PortGroup;
 class PortGroupList;
 
 namespace ARDOUR {
+	class Bundle;
 	class BundleChannel;
 }
 
@@ -47,8 +48,11 @@ public:
 	virtual double parent_to_component_x (double x) const = 0;
 	virtual double component_to_parent_y (double y) const = 0;
 	virtual double parent_to_component_y (double y) const = 0;
-	virtual void mouseover_changed (PortMatrixNode const &) = 0;
+	virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
 	virtual void draw_extra (cairo_t *) = 0;
+	virtual void button_press (double, double, GdkEventButton *) {}
+	virtual void button_release (double, double, GdkEventButton *) {}
+	virtual void motion (double, double) {}
 
 	void set_show_ports (bool);
 	void setup ();
@@ -58,7 +62,7 @@ public:
 	void require_render () {
 		_render_required = true;
 	}
-	
+
 	void require_rebuild () {
 		_dimension_computation_required = true;
 		_render_required = true;
@@ -74,7 +78,7 @@ public:
 
 	/** @return grid spacing */
 	static uint32_t grid_spacing () {
-		return 32;
+		return 24;
 	}
 
 protected:
@@ -101,7 +105,7 @@ protected:
 
 	/** @return space around the connection indicator */
 	static uint32_t connection_indicator_pad () {
-		return 8;
+		return 6;
 	}
 
 	static uint32_t mouseover_line_width () {
@@ -134,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");
 	}
 
@@ -165,12 +169,12 @@ protected:
 			return Gdk::Color ("#444444");
 		}
 	}
-	
+
 	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;
-	std::pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> position_to_group_and_channel (uint32_t, 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;
@@ -185,7 +189,7 @@ protected:
 	uint32_t _height; ///< full height of the contents
 	Gdk::Rectangle _parent_rectangle;
 
-private:	
+private:
 	GdkPixmap* _pixmap; ///< pixmap
 	bool _render_required; ///< true if the rendered pixmap is out of date
 	bool _dimension_computation_required; ///< true if the dimensions are out of date