X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.cc;h=04b57c404fc1994b8923106a851f38f2f1562f52;hb=fe145ce380074f0e44e722d86ec82231f9281442;hp=fa1989f9144d604587406c32799f50077ef9a349;hpb=5f67a72c341a96872d9cd3d1de357662295d14b0;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index fa1989f914..04b57c404f 100644
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -39,9 +39,8 @@ PortMatrixColumnLabels::PortMatrixColumnLabels (PortMatrix* m, PortMatrixBody* b
 void
 PortMatrixColumnLabels::compute_dimensions ()
 {
-	GdkPixmap* pm = gdk_pixmap_new (NULL, 1, 1, 24);
-	gdk_drawable_set_colormap (pm, gdk_colormap_get_system());
-	cairo_t* cr = gdk_cairo_create (pm);
+	cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 200, 200);
+	cairo_t* cr = cairo_create (surface);
 
 	/* width of the longest bundle name */
 	_longest_bundle_name = 0;
@@ -64,7 +63,7 @@ PortMatrixColumnLabels::compute_dimensions ()
 
 			for (uint32_t k = 0; k < (*j)->bundle->nchannels().n_total(); ++k) {
 
-				if ((*j)->bundle->channel_type(k) != _matrix->type()) {
+				if (!_matrix->should_show ((*j)->bundle->channel_type(k))) {
 					continue;
 				}
 
@@ -95,7 +94,7 @@ PortMatrixColumnLabels::compute_dimensions ()
 	}
 
 	cairo_destroy (cr);
-	g_object_unref (pm);
+	cairo_surface_destroy (surface);
 
 	/* height of the whole thing */
 
@@ -139,9 +138,9 @@ PortMatrixColumnLabels::render (cairo_t* cr)
 		if (_matrix->show_only_bundles()) {
 			x += grid_spacing();
 		} else {
-			x += (*i)->bundle->nchannels().get(_matrix->type()) * grid_spacing();
+			x += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()) * grid_spacing();
 		}
-		
+
 		++N;
 	}
 
@@ -153,17 +152,24 @@ PortMatrixColumnLabels::render (cairo_t* cr)
 
 		for (PortGroup::BundleList::const_iterator i = bundles.begin (); i != bundles.end(); ++i) {
 
-			for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
+			uint32_t const C = _matrix->count_of_our_type ((*i)->bundle->nchannels ());
 
-				if ((*i)->bundle->channel_type(j) != _matrix->type()) {
-					continue;
-				}
-				
+			for (uint32_t j = 0; j < C; ++j) {
 				Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N);
-				render_channel_name (cr, background_colour (), c, x, 0, ARDOUR::BundleChannel ((*i)->bundle, j));
+
+				ARDOUR::BundleChannel bc (
+					(*i)->bundle,
+					(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
+					);
+				
+				render_channel_name (cr, background_colour (), c, x, 0, bc);
 				x += grid_spacing();
 			}
-			
+
+			if (C == 0) {
+				x += grid_spacing ();
+			}
+
 			++N;
 		}
 	}
@@ -203,8 +209,8 @@ PortMatrixColumnLabels::mouseover_changed (list<PortMatrixNode> const &)
 
 		ARDOUR::BundleChannel c = i->column;
 		ARDOUR::BundleChannel r = i->row;
-		
-		if (c.bundle && r.bundle) {
+
+		if (PortMatrix::bundle_with_channels (c.bundle) && PortMatrix::bundle_with_channels (r.bundle)) {
 			add_channel_highlight (c);
 		} else if (c.bundle) {
 			_body->highlight_associated_channels (_matrix->column_index(), c);
@@ -263,7 +269,7 @@ PortMatrixColumnLabels::render_bundle_name (
 	if (_matrix->show_only_bundles()) {
 		w = grid_spacing ();
 	} else {
-		w = b->nchannels().get(_matrix->type()) * grid_spacing();
+		w = _matrix->count_of_our_type_min_1 (b->nchannels()) * grid_spacing();
 	}
 
 	double x_ = xoff;
@@ -349,7 +355,7 @@ PortMatrixColumnLabels::render_channel_name (
 			xoff + grid_spacing() - q * sin (angle ()),
 			yoff + _height - q * cos (angle ())
 			);
-				
+
 
 	} else {
 
@@ -361,19 +367,19 @@ PortMatrixColumnLabels::render_channel_name (
 			);
 	}
 
-	if (bc.bundle->nchannels().get(_matrix->type()) > 1) {
+	if (_matrix->count_of_our_type (bc.bundle->nchannels()) > 1) {
 
 		/* only plot the name if the bundle has more than one channel;
 		   the name of a single channel is assumed to be redundant */
-		
+
 		cairo_save (cr);
 		cairo_rotate (cr, -angle());
-		
+
 		cairo_show_text (
 			cr,
 			bc.bundle->channel_name(bc.channel).c_str()
 			);
-		
+
 		cairo_restore (cr);
 	}
 }
@@ -484,12 +490,11 @@ PortMatrixColumnLabels::motion (double x, double y)
 		) {
 
 		/* if the mouse is over a bundle name, highlight all channels in the bundle */
-		
+
 		list<PortMatrixNode> n;
 
 		for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
-
-			if (w.bundle->channel_type(i) != _matrix->type()) {
+			if (!_matrix->should_show (w.bundle->channel_type (i))) {
 				continue;
 			}
 			
@@ -500,7 +505,7 @@ PortMatrixColumnLabels::motion (double x, double y)
 		_body->set_mouseover (n);
 
 	} else {
-	
+
 		_body->set_mouseover (PortMatrixNode (ARDOUR::BundleChannel (), w));
 	}
-}	
+}