diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-07-01 01:14:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-07-01 01:14:14 +0000 |
| commit | 92e412661772e6b9c83109b7ee4996f4c040d3f4 (patch) | |
| tree | 1f1006c61d03b6b68855d812561d931606ff84b3 /gtk2_ardour/port_matrix_component.cc | |
| parent | aad230da6937358b11976c1db3986575b2e412a0 (diff) | |
Allow port matrix to show both audio and midi ports at the same time, and use that facility for route IO selectors.
git-svn-id: svn://localhost/ardour2/branches/3.0@7344 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 720acce862..b2425dcef4 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 += (*i)->bundle->nchannels().get (_matrix->type()); + 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().get (_matrix->type()); + 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().get (_matrix->type()); + uint32_t const s = _matrix->count_of_our_type ((*j)->bundle->nchannels()); if (p < s) { return ARDOUR::BundleChannel ((*j)->bundle, p); } else { |