From 07a58ffd62f834780eb5dada7c1713e31c2e425a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Aug 2011 20:19:39 +0000 Subject: Stop bundles disappearing from the port matrix when they have no channels (#4209). Also fix the remove all channels menu option. git-svn-id: svn://localhost/ardour2/branches/3.0@9986 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/port_matrix_component.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/port_matrix_component.cc') diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc index 38a07479b0..166488bef0 100644 --- a/gtk2_ardour/port_matrix_component.cc +++ b/gtk2_ardour/port_matrix_component.cc @@ -132,7 +132,7 @@ PortMatrixComponent::group_size (boost::shared_ptr g) const s = bundles.size(); } else { for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) { - s += _matrix->count_of_our_type ((*i)->bundle->nchannels()); + s += _matrix->count_of_our_type_min_1 ((*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 += _matrix->count_of_our_type ((*i)->bundle->nchannels()); + p += _matrix->count_of_our_type_min_1 ((*i)->bundle->nchannels()); } } @@ -195,7 +195,7 @@ PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptrcount_of_our_type ((*j)->bundle->nchannels()); + uint32_t const s = _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()); if (p < s) { return ARDOUR::BundleChannel ((*j)->bundle, p); } else { -- cgit v1.2.3