ardour/livetrax
13
0
Fork 0
Code

Make Bundle::connected_to() optionally check for exclusivity

Browse Source 
If the new optional argument is true, then the first bundle will also
check if it has other connections than to the given bundle.
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2017-08-28 12:18:02 +02:00
parent 6039b44c0a
commit 50c6a90d24
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/ardour/bundle.h
View File

@ -101,7 +101,8 @@ class LIBARDOUR_API Bundle : public PBD::ScopedConnectionList
bool allow_partial = false);
void disconnect (boost::shared_ptr<Bundle>, AudioEngine &);
bool connected_to (boost::shared_ptr<Bundle>, AudioEngine &,
DataType type = DataType::NIL);
DataType type = DataType::NIL,
bool exclusive = false);
bool connected_to_anything (AudioEngine &);
bool has_same_ports (boost::shared_ptr<Bundle>) const;
uint32_t type_channel_to_overall (DataType, uint32_t) const;

19
libs/ardour/bundle.cc
View File

@ -434,8 +434,12 @@ Bundle::emit_changed (Change c)
}
}
/* @return true if a Bundle is connected to another.
* @param type: if not NIL, restrict the check to channels of that type. */
/** 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<Bundle> other, AudioEngine & engine,
DataType type, bool exclusive)
@ -446,7 +450,7 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine,
if (type == DataType::NIL) {
for (DataType::iterator t = DataType::begin();
t != DataType::end(); ++t) {
if (!connected_to(other, engine, *t))
if (!connected_to(other, engine, *t, exclusive))
return false;
}
return true;
@ -456,6 +460,8 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine,
if (other->nchannels().n(type) != N)
return false;
vector<string> port_connections;
for (uint32_t i = 0; i < N; ++i) {
Bundle::PortList const & our_ports =
channel_ports (type_channel_to_overall(type, i));
@ -480,6 +486,13 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine,
return false;
}
}
if (exclusive && p) {
port_connections.clear();
p->get_connections(port_connections);
if (port_connections.size() != other_ports.size())
return false;
}
}
}