ardour/livetrax
13
0
Fork 0
Code

Compare bundle ports per-type

Browse Source 
This addresses the XXX comment in Bundle::has_same_ports()
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2017-08-29 10:42:00 +02:00
parent 41c5913b91
commit d4c211ef6f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/ardour/bundle.cc
View File

@ -563,17 +563,22 @@ Bundle::set_name (string const & n)
bool
Bundle::has_same_ports (boost::shared_ptr<Bundle> 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;
}
}