X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_grid.cc;h=23fda6e4842f6e4b70ba8c6d194fff8187109f87;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=4a2f569d5c35aac875139d311a1d5d58d587cf24;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc
index 4a2f569d5c..23fda6e484 100644
--- a/gtk2_ardour/port_matrix_grid.cc
+++ b/gtk2_ardour/port_matrix_grid.cc
@@ -18,9 +18,8 @@
 */
 
 #include <iostream>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include "ardour/bundle.h"
-#include "ardour/types.h"
 #include "port_matrix_grid.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
@@ -81,7 +80,7 @@ PortMatrixGrid::render (cairo_t* cr)
 
 		if (!_matrix->show_only_bundles()) {
 			cairo_set_line_width (cr, thin_grid_line_width());
-			for (uint32_t j = 0; j < _matrix->count_of_our_type ((*i)->bundle->nchannels()); ++j) {
+			for (uint32_t j = 0; j < _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); ++j) {
 				x += grid_spacing ();
 				cairo_move_to (cr, x, 0);
 				cairo_line_to (cr, x, _height);
@@ -97,6 +96,12 @@ PortMatrixGrid::render (cairo_t* cr)
 		++N;
 	}
 
+	if (_matrix->show_only_bundles ()) {
+		cairo_move_to (cr, x, 0);
+		cairo_line_to (cr, x, _height);
+		cairo_stroke (cr);
+	}
+
 	uint32_t y = 0;
 
 	/* HORIZONTAL GRID LINES */
@@ -111,7 +116,7 @@ PortMatrixGrid::render (cairo_t* cr)
 
 		if (!_matrix->show_only_bundles()) {
 			cairo_set_line_width (cr, thin_grid_line_width());
-			for (uint32_t j = 0; j < _matrix->count_of_our_type ((*i)->bundle->nchannels()); ++j) {
+			for (uint32_t j = 0; j < _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); ++j) {
 				y += grid_spacing ();
 				cairo_move_to (cr, 0, y);
 				cairo_line_to (cr, _width, y);
@@ -127,6 +132,12 @@ PortMatrixGrid::render (cairo_t* cr)
 		++N;
 	}
 
+	if (_matrix->show_only_bundles ()) {
+		cairo_move_to (cr, 0, y);
+		cairo_line_to (cr, _width, y);
+		cairo_stroke (cr);
+	}
+	
 	/* ASSOCIATION INDICATORS and NON-CONNECTABLE INDICATORS */
 
 	/* we draw a grey square in a matrix box if the two ports that intersect at that box
@@ -173,18 +184,22 @@ PortMatrixGrid::render (cairo_t* cr)
 			for (PortGroup::BundleList::const_iterator j = row_bundles.begin(); j != row_bundles.end(); ++j) {
 
 				x = bx;
-				for (uint32_t k = 0; k < (*i)->bundle->nchannels().n_total(); ++k) {
+				for (uint32_t k = 0; k < _matrix->count_of_our_type ((*i)->bundle->nchannels()); ++k) {
 
 					y = by;
-					for (uint32_t l = 0; l < (*j)->bundle->nchannels().n_total(); ++l) {
-
-						if (!_matrix->should_show ((*i)->bundle->channel_type(k)) || !_matrix->should_show ((*j)->bundle->channel_type(l))) {
-							continue;
-						}
+					for (uint32_t l = 0; l < _matrix->count_of_our_type ((*j)->bundle->nchannels()); ++l) {
 
 						ARDOUR::BundleChannel c[2];
-						c[_matrix->column_index()] = ARDOUR::BundleChannel ((*i)->bundle, k);
-						c[_matrix->row_index()] = ARDOUR::BundleChannel ((*j)->bundle, l);
+
+						c[_matrix->column_index()] = ARDOUR::BundleChannel (
+							(*i)->bundle,
+							(*i)->bundle->type_channel_to_overall (_matrix->type (), k)
+							);
+
+						c[_matrix->row_index()] = ARDOUR::BundleChannel (
+							(*j)->bundle,
+							(*j)->bundle->type_channel_to_overall (_matrix->type (), l)
+							);
 
 						if (c[0].bundle->channel_type (c[0].channel) != c[1].bundle->channel_type (c[1].channel)) {
 							/* these two channels are of different types */
@@ -209,13 +224,31 @@ PortMatrixGrid::render (cairo_t* cr)
 						y += grid_spacing();
 					}
 
+					if (_matrix->count_of_our_type ((*j)->bundle->nchannels()) == 0) {
+						/* the *j bundle has no channels of our type, so it will have a dummy
+						   one which needs to be marked non-connectable.
+						*/
+						draw_non_connectable_indicator (cr, x, y);
+					}
+					
 					x += grid_spacing();
 				}
 
-				by += _matrix->count_of_our_type ((*j)->bundle->nchannels()) * grid_spacing();
+				if (_matrix->count_of_our_type ((*i)->bundle->nchannels()) == 0) {
+					/* draw non-connectable indicators for the case where the *i bundle
+					   has no channels of our type (and hence has 1 dummy channel)
+					*/
+					y = by;
+					for (uint32_t l = 0; l < _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()); ++l) {
+						draw_non_connectable_indicator (cr, x, y);
+						y += grid_spacing ();
+					}
+				}
+
+				by += _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()) * grid_spacing();
 			}
 
-			bx += _matrix->count_of_our_type ((*i)->bundle->nchannels()) * grid_spacing();
+			bx += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing();
 		}
 	}
 }
@@ -278,12 +311,12 @@ PortMatrixGrid::position_to_node (double x, double y) const
 }
 
 void
-PortMatrixGrid::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixGrid::button_press (double x, double y, GdkEventButton* ev)
 {
 	ARDOUR::BundleChannel const px = position_to_channel (x, y, _matrix->visible_columns());
 	ARDOUR::BundleChannel const py = position_to_channel (y, x, _matrix->visible_rows());
 
-	if (b == 1) {
+	if (ev->button == 1) {
 
 		_dragging = true;
 		_drag_valid = (px.bundle && py.bundle);
@@ -292,9 +325,9 @@ PortMatrixGrid::button_press (double x, double y, int b, uint32_t t, guint)
 		_drag_start_x = x / grid_spacing ();
 		_drag_start_y = y / grid_spacing ();
 
-	} else if (b == 3) {
+	} else if (ev->button == 3) {
 
-		_matrix->popup_menu (px, py, t);
+		_matrix->popup_menu (px, py, ev->time);
 
 	}
 }
@@ -325,15 +358,16 @@ PortMatrixGrid::set_association (PortMatrixNode node, bool s)
 			ARDOUR::BundleChannel c[2];
 			c[_matrix->row_index()] = node.row;
 			c[_matrix->column_index()] = node.column;
+
 			_matrix->set_state (c, s);
 		}
 	}
 }
 
 void
-PortMatrixGrid::button_release (double x, double y, int b, uint32_t /*t*/, guint s)
+PortMatrixGrid::button_release (double x, double y, GdkEventButton* ev)
 {
-	if (b == 1) {
+	if (ev->button == 1) {
 
 		if (x != -1) {
 
@@ -352,7 +386,7 @@ PortMatrixGrid::button_release (double x, double y, int b, uint32_t /*t*/, guint
 
 			} else {
 
-				if (Keyboard::modifier_state_equals (s, Keyboard::PrimaryModifier)) {
+				if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 					/* associate/disassociate things diagonally down and right until we run out */
 					PortMatrixNode::State s = (PortMatrixNode::State) 0;
 					while (1) {
@@ -402,7 +436,7 @@ PortMatrixGrid::draw_extra (cairo_t* cr)
 		double const x = component_to_parent_x (channel_to_position (i->column, _matrix->visible_columns()) * grid_spacing()) + grid_spacing() / 2;
 		double const y = component_to_parent_y (channel_to_position (i->row, _matrix->visible_rows()) * grid_spacing()) + grid_spacing() / 2;
 
-		if (i->row.bundle && i->column.bundle) {
+		if (PortMatrix::bundle_with_channels (i->row.bundle) && PortMatrix::bundle_with_channels (i->column.bundle)) {
 
 			cairo_move_to (cr, x, y);
 			if (_matrix->arrangement() == PortMatrix::LEFT_TO_BOTTOM) {