diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-11-08 02:10:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-11-08 02:10:56 +0000 |
| commit | 19e97d1d64e8aa6d87d79d1f6332065992e5e027 (patch) | |
| tree | 0b68797f47972b13929236b976035ae95f3c1011 /gtk2_ardour/port_matrix_component.cc | |
| parent | 9fa8238d9d4ebda14d60cc2256d721a0405b5fa0 (diff) | |
Attempt to fix some confusions caused by bundles containing
different types of port; if we loop over N MIDI channels of
a mixed bundle, for example, we must convert 0...N to the
indices of the channels within the bundle. Also remove the
hack of creating new bundles to contain a subset of another
bundle's ports; if you do this, any signals emitted by the
other bundle are ignored. Should fix #4454.
git-svn-id: svn://localhost/ardour2/branches/3.0@10490 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_matrix_component.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix_component.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc index 166488bef0..2637a26d22 100644 --- a/gtk2_ardour/port_matrix_component.cc +++ b/gtk2_ardour/port_matrix_component.cc @@ -197,7 +197,7 @@ PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<co uint32_t const s = _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels()); if (p < s) { - return ARDOUR::BundleChannel ((*j)->bundle, p); + return ARDOUR::BundleChannel ((*j)->bundle, (*j)->bundle->type_channel_to_overall (_matrix->type (), p)); } else { p -= s; } |