export: add support for CAF

[ardour.git] / gtk2_ardour / port_matrix_row_labels.cc

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index fcfeef13d074ba569d229c5c1df33979f58989bc..de921a6cb71336c3cbc165ebd1cc18c5ceab7a9a 100644 (file)
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -19,7 +19,8 @@
 
 #include <iostream>
 #include <boost/weak_ptr.hpp>
-#include <cairo/cairo.h>
+#include <cairo.h>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
 #include "port_matrix_row_labels.h"
 #include "port_matrix.h"
@@ -117,7 +118,12 @@ PortMatrixRowLabels::render (cairo_t* cr)
                        uint32_t const N = _matrix->count_of_our_type ((*i)->bundle->nchannels());
                        for (uint32_t j = 0; j < N; ++j) {
                                Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (M);
-                               render_channel_name (cr, background_colour (), c, 0, y, 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, 0, y, bc);
                                y += grid_spacing();
                                ++M;
                        }
@@ -135,7 +141,7 @@ PortMatrixRowLabels::render (cairo_t* cr)
 }
 
 void
-PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixRowLabels::button_press (double x, double y, GdkEventButton* ev)
 {
        ARDOUR::BundleChannel w = position_to_channel (y, x, _matrix->visible_rows());
 
@@ -147,12 +153,13 @@ PortMatrixRowLabels::button_press (double x, double y, int b, uint32_t t, guint)
                        w.channel = -1;
        }
 
-       if (b == 3) {
-
+       if (Gtkmm2ext::Keyboard::is_delete_event (ev) && w.channel != -1) {
+               _matrix->remove_channel (w);
+       } else if (ev->button == 3) {
                _matrix->popup_menu (
                        ARDOUR::BundleChannel (),
                        w,
-                       t
+                       ev->time
                        );
        }
 }
@@ -334,8 +341,7 @@ PortMatrixRowLabels::motion (double x, double y)
                        list<PortMatrixNode> n;
 
                        for (uint32_t i = 0; i < w.bundle->nchannels().n_total(); ++i) {
-
-                               if (!_matrix->should_show (w.bundle->channel_type(i))) {
+                               if (!_matrix->should_show (w.bundle->channel_type (i))) {
                                        continue;
                                }