fix OSX compilation

[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 3a50edb7c6e10becd16f543e75647f5979c40e32..e2fe306726b66240d4eeae4d61fb672f29c5a557 100644 (file)
--- a/gtk2_ardour/port_matrix_labels.cc
+++ b/gtk2_ardour/port_matrix_labels.cc
@@ -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
@@ -19,19 +19,31 @@
 
 #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 +51,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);
        }