diff options
| author | David Robillard <d@drobilla.net> | 2020-11-28 12:02:55 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-11-28 12:45:57 +0100 |
| commit | 0ae4276ac187a9a361950f26bd67eb2d54636aff (patch) | |
| tree | cc46c2ff5df75d426de5e80b891042ae1ebb7bf3 /src/JackDriver.cpp | |
| parent | 4ac8e622bb4ef5841435fc0815efb6bb756f76da (diff) | |
| download | patchage-0ae4276ac187a9a361950f26bd67eb2d54636aff.tar.gz patchage-0ae4276ac187a9a361950f26bd67eb2d54636aff.tar.bz2 patchage-0ae4276ac187a9a361950f26bd67eb2d54636aff.zip | |
Simplify driver connection interface
Diffstat (limited to 'src/JackDriver.cpp')
| -rw-r--r-- | src/JackDriver.cpp | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index e0b01ff..8127f42 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -22,6 +22,7 @@ #include "PatchageCanvas.hpp" #include "PatchageEvent.hpp" #include "PatchageModule.hpp" +#include "PortNames.hpp" #include "patchage_config.h" #ifdef HAVE_JACK_METADATA @@ -425,27 +426,15 @@ JackDriver::port_names(const PortID& id, return true; } -/** Connects two Jack audio ports. - * To be called from GTK thread only. - * \return Whether connection succeeded. - */ bool -JackDriver::connect(const PortID tail_id, - const std::string& tail_client_name, - const std::string& tail_port_name, - const PortID head_id, - const std::string& head_client_name, - const std::string& head_port_name) +JackDriver::connect(const PortID tail_id, const PortID head_id) { - (void)tail_id; - (void)head_id; - if (!_client) { return false; } - const auto tail_name = tail_client_name + ":" + tail_port_name; - const auto head_name = head_client_name + ":" + head_port_name; + const auto& tail_name = tail_id.jack_name(); + const auto& head_name = head_id.jack_name(); const int result = jack_connect(_client, tail_name.c_str(), head_name.c_str()); @@ -461,27 +450,15 @@ JackDriver::connect(const PortID tail_id, return !result; } -/** Disconnects two Jack audio ports. - * To be called from GTK thread only. - * \return Whether disconnection succeeded. - */ bool -JackDriver::disconnect(const PortID tail_id, - const std::string& tail_client_name, - const std::string& tail_port_name, - const PortID head_id, - const std::string& head_client_name, - const std::string& head_port_name) +JackDriver::disconnect(const PortID tail_id, const PortID head_id) { - (void)tail_id; - (void)head_id; - if (!_client) { return false; } - const auto tail_name = tail_client_name + ":" + tail_port_name; - const auto head_name = head_client_name + ":" + head_port_name; + const auto& tail_name = tail_id.jack_name(); + const auto& head_name = head_id.jack_name(); const int result = jack_disconnect(_client, tail_name.c_str(), head_name.c_str()); |