diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-08-13 20:19:39 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-08-13 20:19:39 +0000 |
| commit | 07a58ffd62f834780eb5dada7c1713e31c2e425a (patch) | |
| tree | 64b6bcd0ea1f9249af3a6656770764bc4933d726 /gtk2_ardour/port_matrix_component.cc | |
| parent | f75bbfd8ac52ea33692c3ee15953ceb2994117ab (diff) | |
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
Diffstat (limited to 'gtk2_ardour/port_matrix_component.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix_component.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<const PortGroup> 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_ptr<co } else { - uint32_t const s = _matrix->count_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 { |