summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/jack_portengine.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-05 21:39:43 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-05 21:39:43 -0400
commit94efddd240f0cef752bfba5e1ccb06eb952221d1 (patch)
tree6ef76faea8c524827941d3350c469591d3ef6d19 /libs/ardour/ardour/jack_portengine.h
parentbc1cc154dc5b67cd49bbca87537331af3328f85b (diff)
fix a problem creating and displaying connected status for ports not owned by ardour (e.g. system:....)
This was caused by using jack_port_get_connections() which will not return the correct status for ports owned by another JACK client. Because of the potential for deadlock by calling jack_port_get_all_connections(), an extra argument was added to several PortEngine:: API calls to specify whether the call is in a process-callback context, which defaults to true. The only place where false is passed is within the GlobalPortMatrix when we need to determine whether two non-ardour ports are connected.
Diffstat (limited to 'libs/ardour/ardour/jack_portengine.h')
-rw-r--r--libs/ardour/ardour/jack_portengine.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/ardour/jack_portengine.h b/libs/ardour/ardour/jack_portengine.h
index f8db0c6ec4..0e1eb48c5c 100644
--- a/libs/ardour/ardour/jack_portengine.h
+++ b/libs/ardour/ardour/jack_portengine.h
@@ -63,11 +63,12 @@ class JACKPortEngine : public PortEngine
PortHandle register_port (const std::string& shortname, ARDOUR::DataType, ARDOUR::PortFlags);
void unregister_port (PortHandle);
- bool connected (PortHandle);
- bool connected_to (PortHandle, const std::string&);
- bool physically_connected (PortHandle);
- int get_connections (PortHandle, std::vector<std::string>&);
+ bool connected (PortHandle, bool process_callback_safe);
+ bool connected_to (PortHandle, const std::string&, bool process_callback_safe);
+ bool physically_connected (PortHandle, bool process_callback_safe);
+ int get_connections (PortHandle, std::vector<std::string>&, bool process_callback_safe);
int connect (PortHandle, const std::string&);
+
int disconnect (PortHandle, const std::string&);
int disconnect_all (PortHandle);
int connect (const std::string& src, const std::string& dst);