X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_component.cc;h=b2425dcef45ddd9e768dd1154bf57b518e70a9c1;hb=a052488c002f21839ca7babb855a481a86eba648;hp=9652a38f210c26bce6a084858811cb59d2219396;hpb=50dd880d7e75b49e7c80c79f32165a756839651c;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc
index 9652a38f21..b2425dcef4 100644
--- a/gtk2_ardour/port_matrix_component.cc
+++ b/gtk2_ardour/port_matrix_component.cc
@@ -41,7 +41,7 @@ PortMatrixComponent::PortMatrixComponent (PortMatrix* m, PortMatrixBody* b)
 PortMatrixComponent::~PortMatrixComponent ()
 {
 	if (_pixmap) {
-		gdk_pixmap_unref (_pixmap);
+		g_object_unref (_pixmap);
 	}
 }
 
@@ -74,7 +74,7 @@ PortMatrixComponent::get_pixmap (GdkDrawable *drawable)
 
 		/* make a pixmap of the right size */
 		if (_pixmap) {
-			gdk_pixmap_unref (_pixmap);
+			g_object_unref (_pixmap);
 		}
 		_pixmap = gdk_pixmap_new (drawable, _width, _height, -1);
 
@@ -132,7 +132,7 @@ PortMatrixComponent::group_size (boost::shared_ptr<const PortGroup> g) const
 		s = bundles.size();
 	} else {
 		for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
-			s += (*i)->bundle->nchannels();
+			s += _matrix->count_of_our_type ((*i)->bundle->nchannels());
 		}
 	}
 
@@ -169,7 +169,7 @@ PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share
 		if (_matrix->show_only_bundles()) {
 			p += 1;
 		} else {
-			p += (*i)->bundle->nchannels ();
+			p += _matrix->count_of_our_type ((*i)->bundle->nchannels());
 		}
 	}
 
@@ -195,7 +195,7 @@ PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<co
 			
 		} else {
 			
-			uint32_t const s = (*j)->bundle->nchannels ();
+			uint32_t const s = _matrix->count_of_our_type ((*j)->bundle->nchannels());
 			if (p < s) {
 				return ARDOUR::BundleChannel ((*j)->bundle, p);
 			} else {