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 compile warnings

Browse source 
Fix trivial compile warnings.
This commit is contained in:
Takashi Iwai 2005-12-16 18:43:49 +00:00
parent 0ec2247972
commit 76f7af823b
6 changed files with 38 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

58
modules/mixer/simple/sbase.c
View file

@ -50,6 +50,7 @@ static unsigned int chanmap_to_channels(unsigned int chanmap)
return res; return res;
} }
#if 0
static long to_user(struct selem_base *s, int dir, struct helem_base *c, long value) static long to_user(struct selem_base *s, int dir, struct helem_base *c, long value)
{ {
int64_t n; int64_t n;
@ -67,6 +68,7 @@ static long from_user(struct selem_base *s, int dir, struct helem_base *c, long
n = (int64_t) (value - s->dir[dir].min) * (c->max - c->min); n = (int64_t) (value - s->dir[dir].min) * (c->max - c->min);
return c->min + (n + (s->dir[dir].max - s->dir[dir].min) / 2) / (s->dir[dir].max - s->dir[dir].min); return c->min + (n + (s->dir[dir].max - s->dir[dir].min) / 2) / (s->dir[dir].max - s->dir[dir].min);
} }
#endif
static void update_ranges(struct selem_base *s) static void update_ranges(struct selem_base *s)
{ {
@ -200,18 +202,22 @@ static int get_dB_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
return -ENXIO; return -ENXIO;
} }
static int get_switch_ops(snd_mixer_elem_t *elem, int dir, static int get_switch_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel, int *value) int dir ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel ATTRIBUTE_UNUSED,
int *value)
{ {
struct selem_base *s = snd_mixer_elem_get_private(elem); /* struct selem_base *s = snd_mixer_elem_get_private(elem); */
*value = 0; *value = 0;
return 0; return 0;
} }
static int set_volume_ops(snd_mixer_elem_t *elem, int dir, static int set_volume_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel, long value) int dir ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel ATTRIBUTE_UNUSED,
long value ATTRIBUTE_UNUSED)
{ {
struct selem_base *s = snd_mixer_elem_get_private(elem); /* struct selem_base *s = snd_mixer_elem_get_private(elem); */
return 0; return 0;
} }
@ -224,35 +230,38 @@ static int set_dB_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
return -ENXIO; return -ENXIO;
} }
static int set_switch_ops(snd_mixer_elem_t *elem, int dir, static int set_switch_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel, int value) int dir ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel ATTRIBUTE_UNUSED,
int value ATTRIBUTE_UNUSED)
{ {
struct selem_base *s = snd_mixer_elem_get_private(elem); /* struct selem_base *s = snd_mixer_elem_get_private(elem); */
int changed; /* int changed; */
return 0; return 0;
} }
static int enum_item_name_ops(snd_mixer_elem_t *elem, static int enum_item_name_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
unsigned int item, unsigned int item ATTRIBUTE_UNUSED,
size_t maxlen, char *buf) size_t maxlen ATTRIBUTE_UNUSED,
char *buf ATTRIBUTE_UNUSED)
{ {
struct selem_base *s = snd_mixer_elem_get_private(elem); /* struct selem_base *s = snd_mixer_elem_get_private(elem);*/
return 0; return 0;
} }
static int get_enum_item_ops(snd_mixer_elem_t *elem, static int get_enum_item_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel, snd_mixer_selem_channel_id_t channel ATTRIBUTE_UNUSED,
unsigned int *itemp) unsigned int *itemp ATTRIBUTE_UNUSED)
{ {
struct selem_base *s = snd_mixer_elem_get_private(elem); /* struct selem_base *s = snd_mixer_elem_get_private(elem); */
return 0; return 0;
} }
static int set_enum_item_ops(snd_mixer_elem_t *elem, static int set_enum_item_ops(snd_mixer_elem_t *elem ATTRIBUTE_UNUSED,
snd_mixer_selem_channel_id_t channel, snd_mixer_selem_channel_id_t channel ATTRIBUTE_UNUSED,
unsigned int item) unsigned int item ATTRIBUTE_UNUSED)
{ {
struct selem_base *s = snd_mixer_elem_get_private(elem); /* struct selem_base *s = snd_mixer_elem_get_private(elem); */
return 0; return 0;
} }
@ -283,7 +292,7 @@ static int selem_read(snd_mixer_elem_t *elem)
} }
static int simple_event_remove(snd_hctl_elem_t *helem, static int simple_event_remove(snd_hctl_elem_t *helem,
snd_mixer_elem_t *melem) snd_mixer_elem_t *melem ATTRIBUTE_UNUSED)
{ {
printf("event remove: %p\n", helem); printf("event remove: %p\n", helem);
return 0; return 0;
@ -309,7 +318,6 @@ static int simple_event_add1(snd_mixer_class_t *class,
struct helem_selector *sel) struct helem_selector *sel)
{ {
struct bclass_private *priv = snd_mixer_sbasic_get_private(class); struct bclass_private *priv = snd_mixer_sbasic_get_private(class);
int count;
snd_mixer_elem_t *melem; snd_mixer_elem_t *melem;
snd_mixer_selem_id_t *id; snd_mixer_selem_id_t *id;
snd_ctl_elem_info_t *info; snd_ctl_elem_info_t *info;
@ -571,7 +579,7 @@ int alsa_mixer_sbasic_sidreg(snd_mixer_class_t *class,
INIT_LIST_HEAD(&priv->sids); INIT_LIST_HEAD(&priv->sids);
snd_mixer_sbasic_set_private(class, priv); snd_mixer_sbasic_set_private(class, priv);
snd_mixer_sbasic_set_private_free(class, sbasic_cpriv_free); snd_mixer_sbasic_set_private_free(class, sbasic_cpriv_free);
} }
sid->sids = sids; sid->sids = sids;
sid->count = count; sid->count = count;
list_add(&sid->list, &priv->sids); list_add(&sid->list, &priv->sids);

2
src/mixer/mixer_local.h
View file

@ -77,6 +77,6 @@ struct _snd_mixer {
}; };
struct _snd_mixer_selem_id { struct _snd_mixer_selem_id {
unsigned char name[60]; char name[60];
unsigned int index; unsigned int index;
}; };

2
src/mixer/simple_none.c
View file

@ -1270,7 +1270,7 @@ static int simple_event_add(snd_mixer_class_t *class, snd_hctl_elem_t *helem)
{ {
const char *name = snd_hctl_elem_get_name(helem); const char *name = snd_hctl_elem_get_name(helem);
size_t len; size_t len;
selem_ctl_type_t type; selem_ctl_type_t type = CTL_SINGLE; /* to shut up warning */
if (snd_hctl_elem_get_interface(helem) != SND_CTL_ELEM_IFACE_MIXER) if (snd_hctl_elem_get_interface(helem) != SND_CTL_ELEM_IFACE_MIXER)
return 0; return 0;
if (strcmp(name, "Capture Source") == 0) { if (strcmp(name, "Capture Source") == 0) {

2
src/pcm/pcm_direct.c
View file

@ -875,7 +875,7 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
} }
if (buffer_is_not_initialized && params->periods > 0) { if (buffer_is_not_initialized && params->periods > 0) {
int periods = params->periods; unsigned int periods = params->periods;
ret = INTERNAL(snd_pcm_hw_params_set_periods_near)(spcm, hw_params, &params->periods, 0); ret = INTERNAL(snd_pcm_hw_params_set_periods_near)(spcm, hw_params, &params->periods, 0);
if (ret < 0) { if (ret < 0) {
SNDERR("unable to set requested periods"); SNDERR("unable to set requested periods");

2
src/pcm/pcm_direct.h
View file

@ -42,7 +42,7 @@ struct slave_params {
int buffer_time; int buffer_time;
snd_pcm_sframes_t period_size; snd_pcm_sframes_t period_size;
snd_pcm_sframes_t buffer_size; snd_pcm_sframes_t buffer_size;
int periods; unsigned int periods;
}; };
typedef struct { typedef struct {

2
src/seq/seq.c
View file

@ -4435,7 +4435,7 @@ int snd_seq_remove_events(snd_seq_t *seq, snd_seq_remove_events_t *rmp)
ep = seq->obuf; ep = seq->obuf;
while (ep - seq->obuf < (ssize_t)seq->obufused) { while (ep - seq->obuf < (ssize_t)seq->obufused) {
ev = ep; ev = (snd_seq_event_t *)ep;
len = snd_seq_event_length(ev); len = snd_seq_event_length(ev);
if (remove_match(rmp, ev)) { if (remove_match(rmp, ev)) {