From 9ae6231e4f2e866119ebc5d552c2ad17c257532a Mon Sep 17 00:00:00 2001 From: torben Date: Wed, 12 Jan 2011 17:06:23 +0000 Subject: [PATCH] [latency api] switch JackLatencyCallback to return void git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4109 0c269be4-1314-0410-8aa9-9f06e86f4224 --- example-clients/latent_client.c | 4 +--- jack/types.h | 2 +- libjack/client.c | 3 ++- tools/alsa_in.c | 4 +--- tools/alsa_out.c | 4 +--- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/example-clients/latent_client.c b/example-clients/latent_client.c index 5976bd4..dde6c94 100644 --- a/example-clients/latent_client.c +++ b/example-clients/latent_client.c @@ -46,7 +46,7 @@ process (jack_nframes_t nframes, void *arg) return 0; } -int +void latency_cb (jack_latency_callback_mode_t mode, void *arg) { jack_latency_range_t range; @@ -61,8 +61,6 @@ latency_cb (jack_latency_callback_mode_t mode, void *arg) range.max += latency; jack_port_set_latency_range (input_port, mode, &range); } - - return 0; } /** diff --git a/jack/types.h b/jack/types.h index 859d693..3f07118 100644 --- a/jack/types.h +++ b/jack/types.h @@ -254,7 +254,7 @@ typedef enum JackLatencyCallbackMode jack_latency_callback_mode_t; * * @return zero on success, non-zero on error */ -typedef int (*JackLatencyCallback)(jack_latency_callback_mode_t mode, void *arg); +typedef void (*JackLatencyCallback)(jack_latency_callback_mode_t mode, void *arg); /** * the new latency API operates on Ranges. diff --git a/libjack/client.c b/libjack/client.c index f5449e8..84d2234 100644 --- a/libjack/client.c +++ b/libjack/client.c @@ -668,7 +668,8 @@ jack_client_handle_latency_callback (jack_client_t *client, jack_event_t *event, /* we have a latency callback setup by the client, * lets use it... */ - return client->latency_cb ( mode, client->latency_cb_arg); + client->latency_cb ( mode, client->latency_cb_arg); + return 0; } #if JACK_USE_MACH_THREADS diff --git a/tools/alsa_in.c b/tools/alsa_in.c index c6a1a79..e86ef66 100644 --- a/tools/alsa_in.c +++ b/tools/alsa_in.c @@ -469,7 +469,7 @@ again: * sets up the latencies on the ports. */ -int +void latency_cb (jack_latency_callback_mode_t mode, void *arg) { jack_latency_range_t range; @@ -488,8 +488,6 @@ latency_cb (jack_latency_callback_mode_t mode, void *arg) jack_port_set_latency_range (port, mode, &range); } } - - return 0; } diff --git a/tools/alsa_out.c b/tools/alsa_out.c index 4499894..1c8971c 100644 --- a/tools/alsa_out.c +++ b/tools/alsa_out.c @@ -467,7 +467,7 @@ again: * sets up the latencies on the ports. */ -int +void latency_cb (jack_latency_callback_mode_t mode, void *arg) { jack_latency_range_t range; @@ -486,8 +486,6 @@ latency_cb (jack_latency_callback_mode_t mode, void *arg) jack_port_set_latency_range (port, mode, &range); } } - - return 0; }