Browse Source

[latency api] switch JackLatencyCallback to return void

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4109 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.120.1
torben 15 years ago
parent
commit
9ae6231e4f
5 changed files with 6 additions and 11 deletions
  1. +1
    -3
      example-clients/latent_client.c
  2. +1
    -1
      jack/types.h
  3. +2
    -1
      libjack/client.c
  4. +1
    -3
      tools/alsa_in.c
  5. +1
    -3
      tools/alsa_out.c

+ 1
- 3
example-clients/latent_client.c View File

@@ -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;
}

/**


+ 1
- 1
jack/types.h View File

@@ -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.


+ 2
- 1
libjack/client.c View File

@@ -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


+ 1
- 3
tools/alsa_in.c View File

@@ -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;
}




+ 1
- 3
tools/alsa_out.c View File

@@ -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;
}




Loading…
Cancel
Save