From 8cb40ab25b3de8d52a1e205cc5e34b9b9c4e91f3 Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" RIVAUD" Date: Wed, 23 Aug 2017 22:01:08 +0200 Subject: Make Bundle::connect able to connect only some DataTypes When |allow_partial| is true, only when the number of channels of a given DataType is the same for both bundles are the corresponding channels connected together. When |allow_partial| is false (the default), the number of channels must match for each DataType (the ChanCounts must be equal) for the connection to be attempted. This also fixes the logic in case two bundles have the same number of channels, or even the same ChanCounts, but not with the DataTypes in the same order (so connecting the ith channel of the bundle to the ith channel of the other bundle makes no sense). --- libs/ardour/bundle.cc | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'libs/ardour/bundle.cc') diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 5e57eb3e10..bdf2446077 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -322,20 +322,37 @@ Bundle::add_channels_from_bundle (boost::shared_ptr other) * with another bundle's channels. * @param other Other bundle. * @param engine AudioEngine to use to make the connections. + * @param allow_partial whether to allow leaving unconnected channels types, + * or require that the ChanCounts match exactly (default false). */ void -Bundle::connect (boost::shared_ptr other, AudioEngine & engine) +Bundle::connect (boost::shared_ptr other, AudioEngine & engine, + bool allow_partial) { - uint32_t const N = n_total(); - assert (N == other->n_total()); + ChanCount our_count = nchannels(); + ChanCount other_count = other->nchannels(); - for (uint32_t i = 0; i < N; ++i) { - Bundle::PortList const & our_ports = channel_ports (i); - Bundle::PortList const & other_ports = other->channel_ports (i); + if (!allow_partial && our_count != other_count) { + assert (our_count == other_count); + return; + } - for (Bundle::PortList::const_iterator j = our_ports.begin(); j != our_ports.end(); ++j) { - for (Bundle::PortList::const_iterator k = other_ports.begin(); k != other_ports.end(); ++k) { - engine.connect (*j, *k); + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + uint32_t N = our_count.n(*t); + if (N != other_count.n(*t)) + continue; + for (uint32_t i = 0; i < N; ++i) { + Bundle::PortList const & our_ports = + channel_ports (type_channel_to_overall(*t, i)); + Bundle::PortList const & other_ports = + other->channel_ports (other->type_channel_to_overall(*t, i)); + + for (Bundle::PortList::const_iterator j = our_ports.begin(); + j != our_ports.end(); ++j) { + for (Bundle::PortList::const_iterator k = other_ports.begin(); + k != other_ports.end(); ++k) { + engine.connect (*j, *k); + } } } } -- cgit v1.2.3