smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

check that we're still connected to JACK when using jack_port_get_connections()

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8543 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-01-19 18:58:50 +00:00
parent 5f13eb411e
commit 3c1e12e7ac
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libs/ardour/port.cc
View file

@ -91,6 +91,14 @@ Port::disconnect_all ()
bool bool
Port::connected_to (std::string const & o) const Port::connected_to (std::string const & o) const
{ {
if (!_engine->connected()) {
/* in some senses, this answer isn't the right one all the time,
because we know about our connections and will re-establish
them when we reconnect to JACK.
*/
return false;
}
return jack_port_connected_to (_jack_port, _engine->make_port_name_non_relative(o).c_str ()); return jack_port_connected_to (_jack_port, _engine->make_port_name_non_relative(o).c_str ());
} }
@ -100,15 +108,17 @@ Port::get_connections (std::vector<std::string> & c) const
{ {
int n = 0; int n = 0;
const char** jc = jack_port_get_connections (_jack_port); if (_engine->connected()) {
if (jc) { const char** jc = jack_port_get_connections (_jack_port);
for (int i = 0; jc[i]; ++i) { if (jc) {
c.push_back (jc[i]); for (int i = 0; jc[i]; ++i) {
++n; c.push_back (jc[i]);
} ++n;
}
jack_free (jc);
} jack_free (jc);
}
}
return n; return n;
} }