mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-05 01:40:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce compilation warnings

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2012-10-30 13:07:48 +01:00
parent edcd677bf2
commit 49dde08641
9 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/alisp/alisp.c
View file

@ -3256,7 +3256,7 @@ int alsa_lisp(struct alisp_cfg *cfg, struct alisp_instance **_instance)
else else
alsa_lisp_free(instance); alsa_lisp_free(instance);
return 0; return retval;
} }
void alsa_lisp_free(struct alisp_instance *instance) void alsa_lisp_free(struct alisp_instance *instance)

2
src/mixer/simple_none.c
View file

@ -672,7 +672,6 @@ static int simple_update(snd_mixer_elem_t *melem)
unsigned int caps, pchannels, cchannels; unsigned int caps, pchannels, cchannels;
long pmin, pmax, cmin, cmax; long pmin, pmax, cmin, cmax;
selem_ctl_t *ctl; selem_ctl_t *ctl;
const char *name;
caps = 0; caps = 0;
pchannels = 0; pchannels = 0;
@ -683,7 +682,6 @@ static int simple_update(snd_mixer_elem_t *melem)
cmax = LONG_MIN; cmax = LONG_MIN;
assert(snd_mixer_elem_get_type(melem) == SND_MIXER_ELEM_SIMPLE); assert(snd_mixer_elem_get_type(melem) == SND_MIXER_ELEM_SIMPLE);
simple = snd_mixer_elem_get_private(melem); simple = snd_mixer_elem_get_private(melem);
name = snd_mixer_selem_get_name(melem);
ctl = &simple->ctls[CTL_SINGLE]; ctl = &simple->ctls[CTL_SINGLE];
if (ctl->elem) { if (ctl->elem) {
pchannels = cchannels = ctl->values; pchannels = cchannels = ctl->values;

2
src/pcm/pcm_generic.c
View file

@ -41,7 +41,7 @@ int snd_pcm_generic_close(snd_pcm_t *pcm)
if (generic->close_slave) if (generic->close_slave)
err = snd_pcm_close(generic->slave); err = snd_pcm_close(generic->slave);
free(generic); free(generic);
return 0; return err;
} }
int snd_pcm_generic_nonblock(snd_pcm_t *pcm, int nonblock) int snd_pcm_generic_nonblock(snd_pcm_t *pcm, int nonblock)

2
src/pcm/pcm_ioplug.c
View file

@ -625,7 +625,7 @@ static snd_pcm_sframes_t snd_pcm_ioplug_avail_update(snd_pcm_t *pcm)
snd_pcm_uframes_t avail; snd_pcm_uframes_t avail;
snd_pcm_ioplug_hw_ptr_update(pcm); snd_pcm_ioplug_hw_ptr_update(pcm);
if (io->data->state == SNDRV_PCM_STATE_XRUN) if (io->data->state == SND_PCM_STATE_XRUN)
return -EPIPE; return -EPIPE;
if (pcm->stream == SND_PCM_STREAM_CAPTURE && if (pcm->stream == SND_PCM_STREAM_CAPTURE &&
pcm->access != SND_PCM_ACCESS_RW_INTERLEAVED && pcm->access != SND_PCM_ACCESS_RW_INTERLEAVED &&

8
src/pcm/pcm_ladspa.c
View file

@ -612,8 +612,7 @@ static int snd_pcm_ladspa_allocate_instances(snd_pcm_t *pcm, snd_pcm_ladspa_t *l
{ {
struct list_head *list, *pos; struct list_head *list, *pos;
unsigned int depth, idx, count; unsigned int depth, idx, count;
unsigned int in_channel, out_channel; unsigned int in_channels;
unsigned int in_channels, out_channels;
unsigned int in_ports, out_ports; unsigned int in_ports, out_ports;
snd_pcm_ladspa_instance_t *instance = NULL; snd_pcm_ladspa_instance_t *instance = NULL;
int err; int err;
@ -622,11 +621,8 @@ static int snd_pcm_ladspa_allocate_instances(snd_pcm_t *pcm, snd_pcm_ladspa_t *l
in_channels = ladspa->channels > 0 ? ladspa->channels : in_channels = ladspa->channels > 0 ? ladspa->channels :
(pcm->stream == SND_PCM_STREAM_PLAYBACK ? pcm->channels : ladspa->plug.gen.slave->channels); (pcm->stream == SND_PCM_STREAM_PLAYBACK ? pcm->channels : ladspa->plug.gen.slave->channels);
depth = 0; depth = 0;
out_channels = 0;
list_for_each(pos, list) { list_for_each(pos, list) {
snd_pcm_ladspa_plugin_t *plugin = list_entry(pos, snd_pcm_ladspa_plugin_t, list); snd_pcm_ladspa_plugin_t *plugin = list_entry(pos, snd_pcm_ladspa_plugin_t, list);
if (pos->next == list) /* last entry */
out_channels = pcm->stream == SND_PCM_STREAM_PLAYBACK ? ladspa->plug.gen.slave->channels : pcm->channels;
in_ports = snd_pcm_ladspa_count_ports(plugin, LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO); in_ports = snd_pcm_ladspa_count_ports(plugin, LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO);
out_ports = snd_pcm_ladspa_count_ports(plugin, LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO); out_ports = snd_pcm_ladspa_count_ports(plugin, LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO);
count = 1; count = 1;
@ -636,8 +632,6 @@ static int snd_pcm_ladspa_allocate_instances(snd_pcm_t *pcm, snd_pcm_ladspa_t *l
else else
plugin->policy = SND_PCM_LADSPA_POLICY_NONE; plugin->policy = SND_PCM_LADSPA_POLICY_NONE;
} }
in_channel = 0;
out_channel = 0;
for (idx = 0; idx < count; idx++) { for (idx = 0; idx < count; idx++) {
instance = (snd_pcm_ladspa_instance_t *)calloc(1, sizeof(snd_pcm_ladspa_instance_t)); instance = (snd_pcm_ladspa_instance_t *)calloc(1, sizeof(snd_pcm_ladspa_instance_t));
if (instance == NULL) if (instance == NULL)

2
src/pcm/pcm_mmap_emul.c
View file

@ -332,9 +332,7 @@ static snd_pcm_sframes_t snd_pcm_mmap_emul_avail_update(snd_pcm_t *pcm)
{ {
mmap_emul_t *map = pcm->private_data; mmap_emul_t *map = pcm->private_data;
snd_pcm_t *slave = map->gen.slave; snd_pcm_t *slave = map->gen.slave;
snd_pcm_sframes_t avail;
avail = snd_pcm_avail_update(slave);
if (!map->mmap_emul || pcm->stream == SND_PCM_STREAM_PLAYBACK) if (!map->mmap_emul || pcm->stream == SND_PCM_STREAM_PLAYBACK)
map->hw_ptr = *slave->hw.ptr; map->hw_ptr = *slave->hw.ptr;
else else

2
src/pcm/pcm_route.c
View file

@ -725,7 +725,7 @@ static snd_pcm_chmap_t *snd_pcm_route_get_chmap(snd_pcm_t *pcm)
for (dst = 0; dst < route->params.ndsts; dst++) { for (dst = 0; dst < route->params.ndsts; dst++) {
snd_pcm_route_ttable_dst_t *d = &route->params.dsts[dst]; snd_pcm_route_ttable_dst_t *d = &route->params.dsts[dst];
for (src = 0; src < d->nsrcs; src++) { for (src = 0; src < d->nsrcs; src++) {
int c = d->srcs[src].channel; unsigned int c = d->srcs[src].channel;
if (c < nsrcs && map->pos[c] == SND_CHMAP_NA) if (c < nsrcs && map->pos[c] == SND_CHMAP_NA)
map->pos[c] = slave_map->pos[dst]; map->pos[c] = slave_map->pos[dst];
} }

5
src/pcm/pcm_share.c
View file

@ -136,18 +136,15 @@ static snd_pcm_uframes_t snd_pcm_share_slave_avail(snd_pcm_share_slave_t *slave)
static snd_pcm_uframes_t _snd_pcm_share_slave_forward(snd_pcm_share_slave_t *slave) static snd_pcm_uframes_t _snd_pcm_share_slave_forward(snd_pcm_share_slave_t *slave)
{ {
struct list_head *i; struct list_head *i;
snd_pcm_uframes_t buffer_size, boundary; snd_pcm_uframes_t buffer_size;
snd_pcm_uframes_t slave_appl_ptr;
snd_pcm_sframes_t frames, safety_frames; snd_pcm_sframes_t frames, safety_frames;
snd_pcm_sframes_t min_frames, max_frames; snd_pcm_sframes_t min_frames, max_frames;
snd_pcm_uframes_t avail, slave_avail; snd_pcm_uframes_t avail, slave_avail;
snd_pcm_uframes_t slave_hw_avail; snd_pcm_uframes_t slave_hw_avail;
slave_avail = snd_pcm_share_slave_avail(slave); slave_avail = snd_pcm_share_slave_avail(slave);
boundary = slave->pcm->boundary;
buffer_size = slave->pcm->buffer_size; buffer_size = slave->pcm->buffer_size;
min_frames = slave_avail; min_frames = slave_avail;
max_frames = 0; max_frames = 0;
slave_appl_ptr = *slave->pcm->appl.ptr;
list_for_each(i, &slave->clients) { list_for_each(i, &slave->clients) {
snd_pcm_share_t *share = list_entry(i, snd_pcm_share_t, list); snd_pcm_share_t *share = list_entry(i, snd_pcm_share_t, list);
snd_pcm_t *pcm = share->pcm; snd_pcm_t *pcm = share->pcm;

2
src/seq/seqmid.c
View file

@ -423,7 +423,7 @@ int snd_seq_parse_address(snd_seq_t *seq, snd_seq_addr_t *addr, const char *arg)
return -EINVAL; return -EINVAL;
cinfo.client = -1; cinfo.client = -1;
while (snd_seq_query_next_client(seq, &cinfo) >= 0) { while (snd_seq_query_next_client(seq, &cinfo) >= 0) {
if ((strlen(cinfo.name) == len) && if ((strlen(cinfo.name) == (size_t)len) &&
! strncmp(arg, cinfo.name, len)) { ! strncmp(arg, cinfo.name, len)) {
addr->client = cinfo.client; addr->client = cinfo.client;
return 0; return 0;