summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-11-30 19:41:14 -0500
committerDavid Robillard <d@drobilla.net>2015-11-30 19:41:14 -0500
commit931be60fedc49fc6fde39a8342928ff6c7e60e07 (patch)
tree41214d69a34f054703bb9497c7883321cfcf42d4
parente19f59e99a63b26d08e7d5506548222675521d40 (diff)
downloadingen-931be60fedc49fc6fde39a8342928ff6c7e60e07.tar.gz
ingen-931be60fedc49fc6fde39a8342928ff6c7e60e07.tar.bz2
ingen-931be60fedc49fc6fde39a8342928ff6c7e60e07.zip
Use jack_port_rename() if available
Closes #1075.
-rw-r--r--src/server/JackDriver.cpp5
-rw-r--r--wscript5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 6b0d2a05..531fb93e 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -268,8 +268,13 @@ JackDriver::rename_port(const Raul::Path& old_path,
{
EnginePort* eport = get_port(old_path);
if (eport) {
+#ifdef HAVE_JACK_PORT_RENAME
+ jack_port_rename(
+ _client, (jack_port_t*)eport->handle(), new_path.substr(1).c_str());
+#else
jack_port_set_name((jack_port_t*)eport->handle(),
new_path.substr(1).c_str());
+#endif
}
}
diff --git a/wscript b/wscript
index 161d06f5..dc558b5f 100644
--- a/wscript
+++ b/wscript
@@ -104,6 +104,11 @@ def configure(conf):
define_name = 'HAVE_JACK_METADATA',
uselib = 'JACK',
mandatory = False)
+ conf.check(function_name = 'jack_port_rename',
+ header_name = 'jack/jack.h',
+ define_name = 'HAVE_JACK_PORT_RENAME',
+ uselib = 'JACK',
+ mandatory = False)
if not Options.options.no_jack_session:
autowaf.define(conf, 'INGEN_JACK_SESSION', 1)