Use conf.fatal for fatal configuration errors

[ardour.git] / gtk2_ardour / port_matrix_labels.cc

diff --git a/gtk2_ardour/port_matrix_labels.cc b/gtk2_ardour/port_matrix_labels.cc
index 2734a193efddfca0cffe2cbe1c56803e69bcf22c..d20b7801c9101be5e5f9e0a3ec78933d49748cab 100644 (file)
--- a/gtk2_ardour/port_matrix_labels.cc
+++ b/gtk2_ardour/port_matrix_labels.cc
@@ -1,37 +1,48 @@
 /*
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2009 Carl Hetherington <carl@carlh.net>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include "ardour/bundle.h"
 #include "port_matrix_labels.h"
+#include "port_matrix.h"
 
 void
 PortMatrixLabels::draw_extra (cairo_t* cr)
 {
        for (std::vector<ARDOUR::BundleChannel>::const_iterator i = _channel_highlights.begin(); i != _channel_highlights.end(); ++i) {
-
-               render_channel_name (
-                       cr,
-                       highlighted_channel_colour(),
-                       component_to_parent_x (channel_x (*i)),
-                       component_to_parent_y (channel_y (*i)),
-                       *i
-                       );
+               if (_matrix->show_only_bundles()) {
+                       render_bundle_name (
+                               cr,
+                               mouseover_line_colour(),
+                               highlighted_channel_colour(),
+                               component_to_parent_x (channel_x (*i)),
+                               component_to_parent_y (channel_y (*i)),
+                               i->bundle
+                               );
+               } else {
+                       render_channel_name (
+                               cr,
+                               mouseover_line_colour(),
+                               highlighted_channel_colour(),
+                               component_to_parent_x (channel_x (*i)),
+                               component_to_parent_y (channel_y (*i)),
+                               *i
+                               );
+               }
        }
 }
 
@@ -39,7 +50,6 @@ void
 PortMatrixLabels::clear_channel_highlights ()
 {
        for (std::vector<ARDOUR::BundleChannel>::const_iterator i = _channel_highlights.begin(); i != _channel_highlights.end(); ++i) {
-
                queue_draw_for (*i);
        }