mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix various warnings

Browse source 
See also ALSA bug#1689
This commit is contained in:
Jaroslav Kysela 2006-10-06 13:18:34 +02:00
parent 8c9e4114a2
commit 57eb3145b8
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/global.h
View file

@ -130,7 +130,7 @@ int snd_shm_area_destroy(struct snd_shm_area *area);
int snd_user_file(const char *file, char **result); int snd_user_file(const char *file, char **result);
#ifndef _POSIC_C_SOURCE #ifndef _POSIX_C_SOURCE
struct timeval { struct timeval {
time_t tv_sec; /* seconds */ time_t tv_sec; /* seconds */
long tv_usec; /* microseconds */ long tv_usec; /* microseconds */

8
src/control/control_ext.c
View file

@ -142,9 +142,9 @@ static int snd_ctl_ext_elem_info(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
{ {
int64_t xmin, xmax, xstep; int64_t xmin, xmax, xstep;
ret = ext->callback->get_integer64_info(ext, key, ret = ext->callback->get_integer64_info(ext, key,
&xmin, (int64_t *)&xmin,
&xmax, (int64_t *)&xmax,
&xstep); (int64_t *)&xstep);
info->value.integer64.min = xmin; info->value.integer64.min = xmin;
info->value.integer64.max = xmax; info->value.integer64.max = xmax;
info->value.integer64.step = xstep; info->value.integer64.step = xstep;
@ -265,7 +265,7 @@ static int snd_ctl_ext_elem_write(snd_ctl_t *handle, snd_ctl_elem_value_t *contr
case SND_CTL_ELEM_TYPE_INTEGER64: case SND_CTL_ELEM_TYPE_INTEGER64:
if (! ext->callback->write_integer64) if (! ext->callback->write_integer64)
goto err; goto err;
ret = ext->callback->write_integer64(ext, key, control->value.integer64.value); ret = ext->callback->write_integer64(ext, key, (int64_t *)control->value.integer64.value);
break; break;
case SND_CTL_ELEM_TYPE_ENUMERATED: case SND_CTL_ELEM_TYPE_ENUMERATED:
if (! ext->callback->write_enumerated) if (! ext->callback->write_enumerated)

4
src/pcm/pcm_direct.c
View file

@ -1236,7 +1236,9 @@ int snd_pcm_direct_open_secondary_client(snd_pcm_t **spcmp, snd_pcm_direct_t *dm
/* /*
* open a slave PCM as secondary client (dup'ed fd) * open a slave PCM as secondary client (dup'ed fd)
*/ */
int snd_pcm_direct_initialize_secondary_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, struct slave_params *params) int snd_pcm_direct_initialize_secondary_slave(snd_pcm_direct_t *dmix,
snd_pcm_t *spcm,
struct slave_params *params ATTRIBUTE_UNUSED)
{ {
int ret; int ret;

2
src/pcm/pcm_hooks.c
View file

@ -308,7 +308,7 @@ static int snd_pcm_hook_add_conf(snd_pcm_t *pcm, snd_config_t *root, snd_config_
snd_config_t *type = NULL, *args = NULL; snd_config_t *type = NULL, *args = NULL;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
int (*install_func)(snd_pcm_t *pcm, snd_config_t *args) = NULL; int (*install_func)(snd_pcm_t *pcm, snd_config_t *args) = NULL;
void *h; void *h = NULL;
if (snd_config_get_type(conf) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(conf) != SND_CONFIG_TYPE_COMPOUND) {
SNDERR("Invalid hook definition"); SNDERR("Invalid hook definition");
return -EINVAL; return -EINVAL;

2
src/pcm/pcm_meter.c
View file

@ -603,7 +603,7 @@ static int snd_pcm_meter_add_scope_conf(snd_pcm_t *pcm, const char *name,
int (*open_func)(snd_pcm_t *, const char *, int (*open_func)(snd_pcm_t *, const char *,
snd_config_t *, snd_config_t *) = NULL; snd_config_t *, snd_config_t *) = NULL;
snd_pcm_meter_t *meter = pcm->private_data; snd_pcm_meter_t *meter = pcm->private_data;
void *h; void *h = NULL;
int err; int err;
if (snd_config_get_type(conf) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(conf) != SND_CONFIG_TYPE_COMPOUND) {