diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-06-30 02:59:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-06-30 02:59:13 +0000 |
| commit | 5f67a72c341a96872d9cd3d1de357662295d14b0 (patch) | |
| tree | 69ac5fad51fc894c0af153121822f479358c57be /gtk2_ardour/port_matrix_component.cc | |
| parent | 8efaca01efcdb1c7606d3f2aa18e875fd7a26244 (diff) | |
Basic tweaks to make the bundles and the port matrix accept that MIDI tracks may have audio IO, and vice versa. Allows connection of instrument tracks using the global port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7335 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 440376d1fa..720acce862 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(); + s += (*i)->bundle->nchannels().get (_matrix->type()); } } @@ -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 += (*i)->bundle->nchannels().get (_matrix->type()); } } @@ -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 = (*j)->bundle->nchannels().get (_matrix->type()); if (p < s) { return ARDOUR::BundleChannel ((*j)->bundle, p); } else { |