Various adjustments to user bundle handling, with the general aim of allowing the user to create meaningful bundles with respect to their sound card an outboard setup, and having those user bundles take priority over ardour-generated ones.

git-svn-id: svn://localhost/ardour2/branches/3.0@6050 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 15 insertions, 9 deletions

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index fa3d3dd030..70476af7af 100644
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -424,15 +424,21 @@ PortMatrixColumnLabels::render_channel_name (
 			);
 	}
 
-	cairo_save (cr);
-	cairo_rotate (cr, -angle());
-
-	cairo_show_text (
-		cr,
-		bc.bundle->channel_name(bc.channel).c_str()
-		);
-
-	cairo_restore (cr);
+	if (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);
+	}
 }
 
 double