Fix typo in last commit.

[ardour.git] / gtk2_ardour / port_matrix_column_labels.cc

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 091eb0f9daf0375972345d84f8a8cb34a5494050..04b57c404fc1994b8923106a851f38f2f1562f52 100644 (file)
--- 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, gdk_visual_get_depth (gdk_visual_get_system ()));
-       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;
@@ -95,7 +94,7 @@ PortMatrixColumnLabels::compute_dimensions ()
        }
 
        cairo_destroy (cr);
-       g_object_unref (pm);
+       cairo_surface_destroy (surface);
 
        /* height of the whole thing */
 
@@ -157,7 +156,13 @@ PortMatrixColumnLabels::render (cairo_t* cr)
 
                        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();
                        }
 
@@ -488,9 +493,11 @@ PortMatrixColumnLabels::motion (double x, double y)
 
                list<PortMatrixNode> n;
 
-               uint32_t const N = _matrix->count_of_our_type (w.bundle->nchannels ());
-
-               for (uint32_t i = 0; i < N; ++i) {
+               for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
+                       if (!_matrix->should_show (w.bundle->channel_type (i))) {
+                               continue;
+                       }
+                       
                        ARDOUR::BundleChannel const bc (w.bundle, i);
                        n.push_back (PortMatrixNode (ARDOUR::BundleChannel (), bc));
                }