X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fport_matrix_body.cc;h=83864a607c690bb74dc3c699bb8b6b38071ded82;hb=0f233a86d1a7211275d8f39b2aad7c08d8279b16;hp=009c63fa2a8cee4283068693938223dcaef65993;hpb=2ba936f0b3ae0472653c1d47c11819c8c5c70cce;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_body.cc b/gtk2_ardour/port_matrix_body.cc
index 009c63fa2a..83864a607c 100644
--- a/gtk2_ardour/port_matrix_body.cc
+++ b/gtk2_ardour/port_matrix_body.cc
@@ -112,7 +112,7 @@ PortMatrixBody::on_expose_event (GdkEventExpose* event)
 		r.intersect ((*i)->parent_rectangle(), intersects);
 
 		if (intersects) {
-			
+
 			gdk_draw_drawable (
 				get_window()->gobj(),
 				get_style()->get_fg_gc (Gtk::STATE_NORMAL)->gobj(),
@@ -261,25 +261,25 @@ PortMatrixBody::setup ()
 	if (_matrix->visible_rows()) {
 		PortGroup::BundleList r = _matrix->visible_rows()->bundles ();
 		for (PortGroup::BundleList::iterator i = r.begin(); i != r.end(); ++i) {
-			
+
 			(*i)->bundle->Changed.connect (_bundle_connections, invalidator (*this), boost::bind (&PortMatrixBody::rebuild_and_draw_row_labels, this), gui_context());
-			
+
 		}
 	}
-	
+
 	if (_matrix->visible_columns()) {
 		PortGroup::BundleList c = _matrix->visible_columns()->bundles ();
 		for (PortGroup::BundleList::iterator i = c.begin(); i != c.end(); ++i) {
 			(*i)->bundle->Changed.connect (_bundle_connections, invalidator (*this), boost::bind (&PortMatrixBody::rebuild_and_draw_column_labels, this), gui_context());
 		}
 	}
-		
+
 	for (list<PortMatrixComponent*>::iterator i = _components.begin(); i != _components.end(); ++i) {
 		(*i)->setup ();
 	}
 
 	set_mouseover (PortMatrixNode ());
-	
+
 	_ignore_component_size_changed = true;
 	compute_rectangles ();
 	_ignore_component_size_changed = false;
@@ -334,7 +334,7 @@ PortMatrixBody::on_button_press_event (GdkEventButton* ev)
 			(*i)->button_press (
 				(*i)->parent_to_component_x (ev->x),
 				(*i)->parent_to_component_y (ev->y),
-				ev->button, ev->time, ev->state
+				ev
 				);
 		}
 	}
@@ -350,12 +350,12 @@ PortMatrixBody::on_button_release_event (GdkEventButton* ev)
 			(*i)->button_release (
 				(*i)->parent_to_component_x (ev->x),
 				(*i)->parent_to_component_y (ev->y),
-				ev->button, ev->time, ev->state
+				ev
 				);
 		} else {
 			(*i)->button_release (
 				-1, -1,
-				ev->button, ev->time, ev->state
+				ev
 				);
 		}
 	}
@@ -398,7 +398,7 @@ bool
 PortMatrixBody::on_motion_notify_event (GdkEventMotion* ev)
 {
 	bool done = false;
-	
+
 	for (list<PortMatrixComponent*>::iterator i = _components.begin(); i != _components.end(); ++i) {
 		if (Gdk::Region ((*i)->parent_rectangle()).point_in (ev->x, ev->y)) {
 			(*i)->motion (
@@ -409,7 +409,7 @@ PortMatrixBody::on_motion_notify_event (GdkEventMotion* ev)
 			done = true;
 		}
 	}
-			
+
 
 	if (!done) {
 		set_mouseover (PortMatrixNode ());
@@ -446,7 +446,7 @@ PortMatrixBody::set_mouseover (list<PortMatrixNode> const & n)
 
 	list<PortMatrixNode> old = _mouseover;
 	_mouseover = n;
-	
+
 	for (list<PortMatrixComponent*>::iterator i = _components.begin(); i != _components.end(); ++i) {
 		(*i)->mouseover_changed (old);
 	}
@@ -458,7 +458,7 @@ PortMatrixBody::highlight_associated_channels (int dim, ARDOUR::BundleChannel h)
 	ARDOUR::BundleChannel bc[2];
 	bc[dim] = h;
 
-	if (!bc[dim].bundle) {
+	if (!PortMatrix::bundle_with_channels (bc[dim].bundle)) {
 		return;
 	}
 
@@ -476,9 +476,14 @@ PortMatrixBody::highlight_associated_channels (int dim, ARDOUR::BundleChannel h)
 			if (!_matrix->should_show ((*i)->bundle->channel_type(j))) {
 				continue;
 			}
-			
+
 			bc[1 - dim] = ARDOUR::BundleChannel ((*i)->bundle, j);
-			if (_matrix->get_state (bc) == PortMatrixNode::ASSOCIATED) {
+
+			PortMatrixNode n;
+			n.row = bc[_matrix->row_index()];
+			n.column = bc[_matrix->column_index()];
+
+			if (_matrix->get_association(n) != PortMatrixNode::NOT_ASSOCIATED) {
 				if (dim == _matrix->column_index()) {
 					_row_labels->add_channel_highlight (bc[1 - dim]);
 				} else {
@@ -502,7 +507,7 @@ PortMatrixBody::component_size_changed ()
 	if (_ignore_component_size_changed) {
 		return;
 	}
-	
+
 	compute_rectangles ();
 	_matrix->setup_scrollbars ();
 }