diff options
Diffstat (limited to 'libs/ardour/bundle.cc')
| -rw-r--r-- | libs/ardour/bundle.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 0ac62d7076..834a98d347 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -443,27 +443,26 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine) return true; } -/** This must not be called in code executed as a response to a JACK event, - * as it uses jack_port_get_all_connections(). +/** This must not be called in code executed as a response to a backend event, + * as it uses the backend port_get_all_connections(). * @return true if any of this bundle's channels are connected to anything. */ bool Bundle::connected_to_anything (AudioEngine& engine) { + PortManager& pm (engine); + for (uint32_t i = 0; i < nchannels().n_total(); ++i) { Bundle::PortList const & ports = channel_ports (i); for (uint32_t j = 0; j < ports.size(); ++j) { - /* ports[j] may not be an Ardour port, so use JACK directly + + /* ports[j] may not be an Ardour port, so use the port manager directly rather than doing it with Port. */ - jack_port_t* jp = jack_port_by_name (engine.jack(), ports[j].c_str()); - if (jp) { - const char ** c = jack_port_get_all_connections (engine.jack(), jp); - if (c) { - jack_free (c); - return true; - } + + if (pm.connected (ports[j])) { + return true; } } } |