summaryrefslogtreecommitdiff
path: root/libs/backends/jack
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-07-04 00:20:12 +0200
committerRobin Gareus <robin@gareus.org>2015-07-04 00:20:12 +0200
commitd48a5f70684eafea1d2baf23eb318e9aa5a7cbba (patch)
treea219dc5437c83f3e5071b306be99130cee25d895 /libs/backends/jack
parent35ab6e9075fe3262514328b4c1cadf0863d29a93 (diff)
fix weak jack w/new jack_port_rename()
Diffstat (limited to 'libs/backends/jack')
-rw-r--r--libs/backends/jack/weak_libjack.def4
-rw-r--r--libs/backends/jack/weak_libjack.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/backends/jack/weak_libjack.def b/libs/backends/jack/weak_libjack.def
index 34eb94ce51..34902681d5 100644
--- a/libs/backends/jack/weak_libjack.def
+++ b/libs/backends/jack/weak_libjack.def
@@ -65,8 +65,8 @@ JPFUN(1, int, port_unregister, (jack_client_t *c, jack_port_t *p), (c
JPFUN(1, const char *, port_type, (const jack_port_t *p), (p), 0)
JPFUN(1, const char **, port_get_connections, (const jack_port_t *p), (p), 0)
JPFUN(1, const char **, port_get_all_connections, (const jack_client_t *c, const jack_port_t *p), (c,p), 0)
-JPFUN(1, int, port_set_name, (jack_port_t *p, const char *n), (p,n), 0)
-JVFUN(0, port_rename, (jack_client_t*, jack_port_t *p, const char *n), (c, p,n))
+JPFUN(1, int, port_set_name, (jack_port_t *p, const char *n), (p,n), -1)
+JXFUN(0, int, port_rename, (jack_client_t *c, jack_port_t *p, const char *n), (c,p,n), return jack_port_set_name (p,n);)
JPFUN(1, int, port_disconnect, (jack_client_t *c, jack_port_t *p), (c,p), 0)
JPFUN(1, int, connect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1)
JPFUN(1, int, disconnect, (jack_client_t *c, const char *s, const char *d), (c,s,d), -1)
diff --git a/libs/backends/jack/weak_libjack.h b/libs/backends/jack/weak_libjack.h
index 769a62c5b8..3465ef1344 100644
--- a/libs/backends/jack/weak_libjack.h
+++ b/libs/backends/jack/weak_libjack.h
@@ -186,6 +186,9 @@ int have_libjack(void);
#include <jack/metadata.h>
#endif
+// prototype for function currently only available in jack1 headers
+int jack_port_rename (jack_client_t* client, jack_port_t *port, const char *port_name);
+
#ifdef USE_WEAK_JACK
#undef jack_client_open