From 6244671b0450bcfe5ff5f43e9e9c3dfc53272309 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 15 May 2011 15:57:47 +0200 Subject: [PATCH] Small API cleanup. --- audio/alsa.c | 2 +- audio/ext.c | 2 +- audio/jack.c | 2 +- audio/openal.c | 2 +- audio/oss.c | 2 +- audio/pulse.c | 2 +- audio/roar.c | 2 +- audio/rsound.c | 2 +- audio/sdl.c | 2 +- audio/xaudio.c | 2 +- driver.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/audio/alsa.c b/audio/alsa.c index b6cbbf9233..924e803dd3 100644 --- a/audio/alsa.c +++ b/audio/alsa.c @@ -49,7 +49,7 @@ static bool find_float_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) return false; } -static void* __alsa_init(const char* device, int rate, int latency) +static void* __alsa_init(const char* device, unsigned rate, unsigned latency) { alsa_t *alsa = calloc(1, sizeof(alsa_t)); if ( alsa == NULL ) diff --git a/audio/ext.c b/audio/ext.c index 45de05ad70..4adf942b16 100644 --- a/audio/ext.c +++ b/audio/ext.c @@ -45,7 +45,7 @@ static void audio_ext_free(void *data) } } -static void* audio_ext_init(const char *device, int rate, int latency) +static void* audio_ext_init(const char *device, unsigned rate, unsigned latency) { if (!(*g_settings.audio.external_driver)) { diff --git a/audio/jack.c b/audio/jack.c index e1443631a1..c2519d1f83 100644 --- a/audio/jack.c +++ b/audio/jack.c @@ -124,7 +124,7 @@ static size_t find_buffersize(jack_t *jd, int latency) return buffer_frames * sizeof(jack_default_audio_sample_t); } -static void* __jack_init(const char* device, int rate, int latency) +static void* __jack_init(const char* device, unsigned rate, unsigned latency) { jack_t *jd = calloc(1, sizeof(jack_t)); if ( jd == NULL ) diff --git a/audio/openal.c b/audio/openal.c index e556bc35f7..09d96238fc 100644 --- a/audio/openal.c +++ b/audio/openal.c @@ -56,7 +56,7 @@ typedef struct al } al_t; -static void* __al_init(const char* device, int rate, int latency) +static void* __al_init(const char* device, unsigned rate, unsigned latency) { (void)device; al_t *al = calloc(1, sizeof(al_t)); diff --git a/audio/oss.c b/audio/oss.c index c91c919c20..e794d6a9ef 100644 --- a/audio/oss.c +++ b/audio/oss.c @@ -25,7 +25,7 @@ #include #include -static void* __oss_init(const char* device, int rate, int latency) +static void* __oss_init(const char* device, unsigned rate, unsigned latency) { int *fd = calloc(1, sizeof(int)); if ( fd == NULL ) diff --git a/audio/pulse.c b/audio/pulse.c index 819ab6eccf..526927bdd7 100644 --- a/audio/pulse.c +++ b/audio/pulse.c @@ -115,7 +115,7 @@ static void stream_latency_update_cb(pa_stream *s, void *data) pa_threaded_mainloop_signal(pa->mainloop, 0); } -static void* __pulse_init(const char* device, int rate, int latency) +static void* __pulse_init(const char* device, unsigned rate, unsigned latency) { pa_t *pa = calloc(1, sizeof(*pa)); if (!pa) diff --git a/audio/roar.c b/audio/roar.c index dfb0ae774d..dcb98bfaed 100644 --- a/audio/roar.c +++ b/audio/roar.c @@ -30,7 +30,7 @@ typedef struct bool nonblocking; } roar_t; -static void* __roar_init(const char* device, int rate, int latency) +static void* __roar_init(const char* device, unsigned rate, unsigned latency) { int err; roar_t *roar = calloc(1, sizeof(roar_t)); diff --git a/audio/rsound.c b/audio/rsound.c index acf9664861..5577682f02 100644 --- a/audio/rsound.c +++ b/audio/rsound.c @@ -54,7 +54,7 @@ static void err_cb(void *userdata) SDL_CondSignal(rsd->cond); } -static void* __rsd_init(const char* device, int rate, int latency) +static void* __rsd_init(const char* device, unsigned rate, unsigned latency) { rsd_t *rsd = calloc(1, sizeof(rsd_t)); if ( rsd == NULL ) diff --git a/audio/sdl.c b/audio/sdl.c index 389facf5f2..89f1ddb9b4 100644 --- a/audio/sdl.c +++ b/audio/sdl.c @@ -58,7 +58,7 @@ static inline int find_num_frames(int rate, int latency) return next_pow2(frames); } -static void* sdl_audio_init(const char* device, int rate, int latency) +static void* sdl_audio_init(const char* device, unsigned rate, unsigned latency) { (void)device; if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) diff --git a/audio/xaudio.c b/audio/xaudio.c index 7b70364adc..3a2998c8b9 100644 --- a/audio/xaudio.c +++ b/audio/xaudio.c @@ -67,7 +67,7 @@ static bool init_lib(void) return true; } -static void* __xa_init(const char* device, int rate, int latency) +static void* __xa_init(const char* device, unsigned rate, unsigned latency) { if (!init_lib()) return NULL; diff --git a/driver.h b/driver.h index 10d708778a..bf479a6ef4 100644 --- a/driver.h +++ b/driver.h @@ -70,7 +70,7 @@ typedef struct video_info typedef struct audio_driver { - void* (*init)(const char* device, int rate, int latency); + void* (*init)(const char* device, unsigned rate, unsigned latency); ssize_t (*write)(void* data, const void* buf, size_t size); bool (*stop)(void* data); bool (*start)(void* data);