ardour/livetrax
13
0
Fork 0
Code

Make Bundle::disconnect() more robust

Browse Source 
Instead of asserting or crashing if the number of channels of both
bundles don't match, just try to disconnect as much as possible.
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2017-08-29 10:33:53 +02:00
parent 6d0b009995
commit 41c5913b91
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/ardour/bundle.cc
View File

@ -361,16 +361,23 @@ Bundle::connect (boost::shared_ptr<Bundle> other, AudioEngine & engine,
void
Bundle::disconnect (boost::shared_ptr<Bundle> other, AudioEngine & engine)
{
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);
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);
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);
}
}
}
}