From 9ccfb921d49993c80451bed19760a1d1126e2709 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 4 Jul 2015 11:46:09 +0200 Subject: synchronize with https://github.com/x42/weakjack/ --- libs/backends/jack/weak_libjack.def | 8 ++++++++ libs/backends/jack/weak_libjack.h | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'libs/backends/jack') diff --git a/libs/backends/jack/weak_libjack.def b/libs/backends/jack/weak_libjack.def index 34902681d5..c413aca4a7 100644 --- a/libs/backends/jack/weak_libjack.def +++ b/libs/backends/jack/weak_libjack.def @@ -36,6 +36,7 @@ JCFUN(1, jack_nframes_t, get_buffer_size, 0) JPFUN(1, jack_nframes_t, frames_since_cycle_start, (const jack_client_t *c), (c), 0) JPFUN(1, jack_nframes_t, frame_time, (const jack_client_t *c), (c), 0) JPFUN(1, jack_nframes_t, last_frame_time, (const jack_client_t *c), (c), 0) +JPFUN(1, jack_time_t, get_time, (void), (), 0) JCFUN(1, float, cpu_load, 0) JCFUN(1, int, is_realtime, 0) @@ -53,6 +54,7 @@ JPFUN(1, int, port_ensure_monitor, (jack_port_t *p, int o), (p,o), 0) JPFUN(1, int, port_monitoring_input, (jack_port_t *p), (p), 0) JPFUN(1, const char*, port_name, (const jack_port_t *p), (p), NULL) +JPFUN(1, const char*, port_short_name, (const jack_port_t *p), (p), NULL) JPFUN(1, int, port_flags, (const jack_port_t *p), (p), 0) JPFUN(1, const char**, get_ports,(jack_client_t *c, const char *p, const char *t, unsigned long f), (c,p,t,f), NULL) JPFUN(1, int, port_name_size, (void), (), 0) @@ -67,6 +69,7 @@ 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) 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_get_aliases, (const jack_port_t *port, char* const aliases[2]), (port,aliases),1) 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) @@ -142,4 +145,9 @@ JPFUN(0, int, remove_all_properties, (jack_client_t* c), (c), -1) JPFUN(0, int, set_property_change_callback, (jack_client_t *c, JackPropertyChangeCallback s, void *a), (c,s,a), -1) #endif +/* */ +JCFUN(1, float, get_max_delayed_usecs, 0.0) +JCFUN(1, float, get_xrun_delayed_usecs, 0.0) +JVFUN(0, reset_max_delayed_usecs, (jack_client_t *c), (c),) + #endif // end USE_WEAK_JACK diff --git a/libs/backends/jack/weak_libjack.h b/libs/backends/jack/weak_libjack.h index 3465ef1344..0f98de3e51 100644 --- a/libs/backends/jack/weak_libjack.h +++ b/libs/backends/jack/weak_libjack.h @@ -55,6 +55,7 @@ int have_libjack(void); #define jack_frames_since_cycle_start WJACK_frames_since_cycle_start #define jack_frame_time WJACK_frame_time #define jack_last_frame_time WJACK_last_frame_time +#define jack_get_time WJACK_get_time #define jack_cpu_load WJACK_cpu_load #define jack_is_realtime WJACK_is_realtime @@ -87,6 +88,7 @@ int have_libjack(void); #define jack_port_monitoring_input WJACK_port_monitoring_input #define jack_port_name WJACK_port_name +#define jack_port_short_name WJACK_port_short_name #define jack_port_flags WJACK_port_flags #define jack_get_ports WJACK_get_ports #define jack_port_name_size WJACK_port_name_size @@ -95,6 +97,7 @@ int have_libjack(void); #define jack_port_by_name WJACK_port_by_name #define jack_port_by_id WJACK_port_by_id #define jack_port_set_name WJACK_port_set_name +#define jack_port_get_aliases WJACK_port_get_aliases #define jack_port_rename WJACK_port_rename #define jack_port_disconnect WJACK_port_disconnect #define jack_port_register WJACK_port_register @@ -173,6 +176,11 @@ int have_libjack(void); #define jack_set_property_change_callback WJACK_set_property_change_callback #endif +/* */ +#define jack_get_max_delayed_usecs WJACK_get_max_delayed_usecs +#define jack_get_xrun_delayed_usecs WJACK_get_xrun_delayed_usecs +#define jack_reset_max_delayed_usecs WJACK_reset_max_delayed_usecs + #endif // end USE_WEAK_JACK #include -- cgit v1.2.3