X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fport_matrix_component.cc;h=5e11527d299fefc4f4369d7021905a0541320979;hb=6180c5a5fc9a663858d12c31a6783e12f02bfcba;hp=f728f7bd8536660ec15f7f3de95c7bd15239aa7d;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc
index f728f7bd85..5e11527d29 100644
--- a/gtk2_ardour/port_matrix_component.cc
+++ b/gtk2_ardour/port_matrix_component.cc
@@ -24,7 +24,8 @@
 using namespace std;
 
 /** Constructor.
- *  @param p Port matrix that we're in.
+ *  @param m Port matrix that we're in.
+ *  @param b Port matrix body that we're in.
  */
 PortMatrixComponent::PortMatrixComponent (PortMatrix* m, PortMatrixBody* b)
 	: _matrix (m),
@@ -40,7 +41,7 @@ PortMatrixComponent::PortMatrixComponent (PortMatrix* m, PortMatrixBody* b)
 PortMatrixComponent::~PortMatrixComponent ()
 {
 	if (_pixmap) {
-		gdk_pixmap_unref (_pixmap);
+		g_object_unref (_pixmap);
 	}
 }
 
@@ -73,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);
 
@@ -131,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_min_1 ((*i)->bundle->nchannels());
 		}
 	}
 
@@ -139,7 +140,7 @@ PortMatrixComponent::group_size (boost::shared_ptr<const PortGroup> g) const
 }
 
 /** @param bc Channel.
- *  @param groups List of groups.
+ *  @param group Group.
  *  @return Position of bc in groups in grid units, taking show_only_bundles into account.
  */
 uint32_t
@@ -154,21 +155,21 @@ PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share
 		if ((*i)->bundle == bc.bundle) {
 
 			/* found the bundle */
-			
+
 			if (_matrix->show_only_bundles()) {
 				return p;
 			} else {
-				return p + bc.channel;
+				return p + bc.bundle->overall_channel_to_type (_matrix->type (), bc.channel);
 			}
-			
+
 		}
 
 		/* move past this bundle */
-		
+
 		if (_matrix->show_only_bundles()) {
 			p += 1;
 		} else {
-			p += (*i)->bundle->nchannels ();
+			p += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels());
 		}
 	}
 
@@ -180,30 +181,36 @@ ARDOUR::BundleChannel
 PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<const PortGroup> group) const
 {
 	p /= grid_spacing ();
-	
+
 	PortGroup::BundleList const & bundles = group->bundles ();
 	for (PortGroup::BundleList::const_iterator j = bundles.begin(); j != bundles.end(); ++j) {
 
 		if (_matrix->show_only_bundles()) {
-			
+
 			if (p < 1) {
 				return ARDOUR::BundleChannel ((*j)->bundle, -1);
 			} else {
 				p -= 1;
 			}
-			
+
 		} else {
-			
-			uint32_t const s = (*j)->bundle->nchannels ();
+
+			ARDOUR::ChanCount const N = (*j)->bundle->nchannels ();
+
+			uint32_t const s = _matrix->count_of_our_type_min_1 (N);
 			if (p < s) {
-				return ARDOUR::BundleChannel ((*j)->bundle, p);
+				if (p < _matrix->count_of_our_type (N)) {
+					return ARDOUR::BundleChannel ((*j)->bundle, (*j)->bundle->type_channel_to_overall (_matrix->type (), p));
+				} else {
+					return ARDOUR::BundleChannel (boost::shared_ptr<ARDOUR::Bundle> (), -1);
+				}
 			} else {
 				p -= s;
 			}
-			
+
 		}
-		
+
 	}
-	
+
 	return ARDOUR::BundleChannel (boost::shared_ptr<ARDOUR::Bundle> (), -1);
 }