X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbundle.cc;h=65f0c8e127e468da830916ee799e27b4a235fe47;hb=84272b4e27e537bf2c38c9cd25675c61addea40a;hp=5e57eb3e10a4d1eee884219a892d01e429280c7b;hpb=96a6529e2ef4a75a1232d42a13552599d7fb6e28;p=ardour.git diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 5e57eb3e10..65f0c8e127 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); + } } } } @@ -344,16 +361,23 @@ Bundle::connect (boost::shared_ptr other, AudioEngine & engine) void Bundle::disconnect (boost::shared_ptr other, AudioEngine & engine) { - uint32_t const N = n_total(); - assert (N == other->n_total()); - - 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); - - 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.disconnect (*j, *k); + ChanCount our_count = nchannels(); + ChanCount other_count = other->nchannels(); + + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + uint32_t N = min(our_count.n(*t), other_count.n(*t)); + 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.disconnect (*j, *k); + } } } } @@ -417,33 +441,65 @@ Bundle::emit_changed (Change c) } } +/** This must not be called in code executed as a response to a backend event, + * as it may query the backend in the same thread where it's waiting for us. + * @return true if a Bundle is connected to another. + * @param type: if not NIL, restrict the check to channels of that type. + * @param exclusive: if true, additionally check if the bundle is connected + * only to |other|, and return false if not. */ bool -Bundle::connected_to (boost::shared_ptr other, AudioEngine & engine) +Bundle::connected_to (boost::shared_ptr other, AudioEngine & engine, + DataType type, bool exclusive) { - if (_ports_are_inputs == other->_ports_are_inputs || nchannels() != other->nchannels()) { + if (_ports_are_inputs == other->_ports_are_inputs) return false; + + if (type == DataType::NIL) { + for (DataType::iterator t = DataType::begin(); + t != DataType::end(); ++t) { + if (!connected_to(other, engine, *t, exclusive)) + return false; + } + return true; } - for (uint32_t i = 0; i < n_total(); ++i) { - Bundle::PortList const & A = channel_ports (i); - Bundle::PortList const & B = other->channel_ports (i); + uint32_t N = nchannels().n(type); + if (other->nchannels().n(type) != N) + return false; + + vector port_connections; + + for (uint32_t i = 0; i < N; ++i) { + Bundle::PortList const & our_ports = + channel_ports (type_channel_to_overall(type, i)); + Bundle::PortList const & other_ports = + other->channel_ports (other->type_channel_to_overall(type, i)); - for (uint32_t j = 0; j < A.size(); ++j) { - for (uint32_t k = 0; k < B.size(); ++k) { + for (Bundle::PortList::const_iterator j = our_ports.begin(); + j != our_ports.end(); ++j) { + boost::shared_ptr p = engine.get_port_by_name(*j); - boost::shared_ptr p = engine.get_port_by_name (A[j]); - boost::shared_ptr q = engine.get_port_by_name (B[k]); + for (Bundle::PortList::const_iterator k = other_ports.begin(); + k != other_ports.end(); ++k) { + boost::shared_ptr q = engine.get_port_by_name(*k); if (!p && !q) { return false; } - if (p && !p->connected_to (B[k])) { + if (p && !p->connected_to (*k)) { return false; - } else if (q && !q->connected_to (A[j])) { + } else if (q && !q->connected_to (*j)) { return false; } } + + if (exclusive && p) { + port_connections.clear(); + p->get_connections(port_connections); + if (port_connections.size() != other_ports.size()) + return false; + } } } @@ -507,17 +563,22 @@ Bundle::set_name (string const & n) bool Bundle::has_same_ports (boost::shared_ptr b) const { - uint32_t const N = n_total(); + ChanCount our_count = nchannels(); + ChanCount other_count = b->nchannels(); - if (b->n_total() != N) { + if (our_count != other_count) return false; - } - /* XXX: probably should sort channel port lists before comparing them */ + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + uint32_t N = our_count.n(*t); + 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 = + b->channel_ports (b->type_channel_to_overall(*t, i)); - for (uint32_t i = 0; i < N; ++i) { - if (channel_ports (i) != b->channel_ports (i)) { - return false; + if (our_ports != other_ports) + return false; } }