diff options
| author | Robin Gareus <robin@gareus.org> | 2017-12-15 20:47:07 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-12-15 21:56:46 +0100 |
| commit | ca979ee606a7d9343129ed3373b8e75453b7007a (patch) | |
| tree | b09fb656f9a3e79f282abe594a286438daab403c /libs | |
| parent | 886244feeaa6de7dada852846e1f1166233adf1f (diff) | |
Sync weakjack with upstream https://github.com/x42/weakjack/
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/backends/jack/weak_libjack.def | 7 | ||||
| -rw-r--r-- | libs/backends/jack/weak_libjack.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libs/backends/jack/weak_libjack.def b/libs/backends/jack/weak_libjack.def index 009b9cb2f6..e50237df06 100644 --- a/libs/backends/jack/weak_libjack.def +++ b/libs/backends/jack/weak_libjack.def @@ -27,6 +27,7 @@ JPFUN(1, int, set_graph_order_callback, (jack_client_t *c, JackGraphO JPFUN(1, int, set_xrun_callback, (jack_client_t *c, JackXRunCallback g, void *a), (c,g,a), -1) JPFUN(1, int, set_latency_callback, (jack_client_t *c, JackLatencyCallback g, void *a), (c,g,a), -1) JVFUN(1, set_error_function, (void (*f)(const char *)), (f),) +JVFUN(1, set_info_function, (void (*f)(const char *)), (f),) JCFUN(1, int, activate, -1) JCFUN(1, int, deactivate, -1) @@ -69,7 +70,10 @@ 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), -1) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" 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);) +#pragma GCC diagnostic pop JPFUN(1, int, port_get_aliases, (const jack_port_t *port, char* const aliases[2]), (port,aliases), 0) 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) @@ -112,6 +116,9 @@ JPFUN(1, size_t, ringbuffer_write_space, (const jack_ringbuffer_t *rb), JPFUN(1, size_t, ringbuffer_read, (jack_ringbuffer_t *rb, char *d, size_t c), (rb,d,c), 0) JPFUN(1, size_t, ringbuffer_write, (jack_ringbuffer_t *rb, const char *s, size_t c), (rb,s,c), 0) JPFUN(0, int, ringbuffer_mlock, (jack_ringbuffer_t *rb), (rb), 0) +JVFUN(0, ringbuffer_get_read_vector, (const jack_ringbuffer_t *rb, jack_ringbuffer_data_t *v), (rb,v), if (v) {v->buf=NULL; v->len=0;} ) +JVFUN(0, ringbuffer_get_write_vector, (const jack_ringbuffer_t *rb, jack_ringbuffer_data_t *v), (rb,v), if (v) {v->buf=NULL; v->len=0;} ) +JPFUN(0, size_t, ringbuffer_peek, (jack_ringbuffer_t *rb, char *d, size_t c), (rb,d,c), 0) /* <jack/thread.h> */ JCFUN(0, int, client_real_time_priority, 0) diff --git a/libs/backends/jack/weak_libjack.h b/libs/backends/jack/weak_libjack.h index f9cc94f576..f177fb5529 100644 --- a/libs/backends/jack/weak_libjack.h +++ b/libs/backends/jack/weak_libjack.h @@ -74,6 +74,7 @@ int have_libjack(void); #define jack_set_xrun_callback WJACK_set_xrun_callback #define jack_set_latency_callback WJACK_set_latency_callback #define jack_set_error_function WJACK_set_error_function +#define jack_set_info_function WJACK_set_info_function #define jack_activate WJACK_activate #define jack_deactivate WJACK_deactivate @@ -147,6 +148,9 @@ int have_libjack(void); #define jack_ringbuffer_read WJACK_ringbuffer_read #define jack_ringbuffer_write WJACK_ringbuffer_write #define jack_ringbuffer_mlock WJACK_ringbuffer_mlock +#define jack_ringbuffer_get_read_vector WJACK_ringbuffer_get_read_vector +#define jack_ringbuffer_get_write_vector WJACK_ringbuffer_get_write_vector +#define jack_ringbuffer_peek WJACK_ringbuffer_peek /* <jack/thread.h> */ #define jack_client_real_time_priority WJACK_client_real_time_priority |