*/
#include <iostream>
-#include <cairo/cairo.h>
+#include <cairo.h>
#include "ardour/bundle.h"
-#include "ardour/types.h"
#include "port_matrix_grid.h"
#include "port_matrix.h"
#include "port_matrix_body.h"
for (uint32_t l = 0; l < _matrix->count_of_our_type ((*j)->bundle->nchannels()); ++l) {
ARDOUR::BundleChannel c[2];
- c[_matrix->column_index()] = ARDOUR::BundleChannel ((*i)->bundle, k);
- c[_matrix->row_index()] = ARDOUR::BundleChannel ((*j)->bundle, l);
+
+ c[_matrix->column_index()] = ARDOUR::BundleChannel (
+ (*i)->bundle,
+ (*i)->bundle->type_channel_to_overall (_matrix->type (), k)
+ );
+
+ c[_matrix->row_index()] = ARDOUR::BundleChannel (
+ (*j)->bundle,
+ (*j)->bundle->type_channel_to_overall (_matrix->type (), l)
+ );
if (c[0].bundle->channel_type (c[0].channel) != c[1].bundle->channel_type (c[1].channel)) {
/* these two channels are of different types */
y += grid_spacing();
}
- if ((*j)->bundle->nchannels() == ARDOUR::ChanCount::ZERO) {
+ if (_matrix->count_of_our_type ((*j)->bundle->nchannels()) == 0) {
+ /* the *j bundle has no channels of our type, so it will have a dummy
+ one which needs to be marked non-connectable.
+ */
draw_non_connectable_indicator (cr, x, y);
}
x += grid_spacing();
}
- if ((*i)->bundle->nchannels() == ARDOUR::ChanCount::ZERO) {
- draw_non_connectable_indicator (cr, x, y);
+ if (_matrix->count_of_our_type ((*i)->bundle->nchannels()) == 0) {
+ /* draw non-connectable indicators for the case where the *i bundle
+ has no channels of our type (and hence has 1 dummy channel)
+ */
+ y = by;
+ for (uint32_t l = 0; l < _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()); ++l) {
+ draw_non_connectable_indicator (cr, x, y);
+ y += grid_spacing ();
+ }
}
by += _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()) * grid_spacing();
}
void
-PortMatrixGrid::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixGrid::button_press (double x, double y, GdkEventButton* ev)
{
ARDOUR::BundleChannel const px = position_to_channel (x, y, _matrix->visible_columns());
ARDOUR::BundleChannel const py = position_to_channel (y, x, _matrix->visible_rows());
- if (b == 1) {
+ if (ev->button == 1) {
_dragging = true;
_drag_valid = (px.bundle && py.bundle);
_drag_start_x = x / grid_spacing ();
_drag_start_y = y / grid_spacing ();
- } else if (b == 3) {
+ } else if (ev->button == 3) {
- _matrix->popup_menu (px, py, t);
+ _matrix->popup_menu (px, py, ev->time);
}
}
ARDOUR::BundleChannel c[2];
c[_matrix->row_index()] = node.row;
c[_matrix->column_index()] = node.column;
+
_matrix->set_state (c, s);
}
}
}
void
-PortMatrixGrid::button_release (double x, double y, int b, uint32_t /*t*/, guint s)
+PortMatrixGrid::button_release (double x, double y, GdkEventButton* ev)
{
- if (b == 1) {
+ if (ev->button == 1) {
if (x != -1) {
} else {
- if (Keyboard::modifier_state_equals (s, Keyboard::PrimaryModifier)) {
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* associate/disassociate things diagonally down and right until we run out */
PortMatrixNode::State s = (PortMatrixNode::State) 0;
while (1) {