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

Small fixes (capture & switch read)

Browse source
This commit is contained in:
Jaroslav Kysela 2001-07-25 12:33:35 +00:00
parent ff1820f1ad
commit 48c58ade1d
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/mixer/simple.c
View file

@ -254,13 +254,12 @@ static int elem_read_switch(selem_t *s, int dir, selem_ctl_type_t type)
memset(&ctl, 0, sizeof(ctl)); memset(&ctl, 0, sizeof(ctl));
if ((err = snd_hctl_elem_read(c->elem, &ctl)) < 0) if ((err = snd_hctl_elem_read(c->elem, &ctl)) < 0)
return err; return err;
s->str[dir].sw = 0;
for (idx = 0; idx < s->str[dir].channels; idx++) { for (idx = 0; idx < s->str[dir].channels; idx++) {
unsigned int idx1 = idx; unsigned int idx1 = idx;
if (idx >= c->values) if (idx >= c->values)
idx1 = 0; idx1 = 0;
if (ctl.value.integer.value[idx1]) if (!ctl.value.integer.value[idx1])
s->str[dir].sw |= 1 << idx; s->str[dir].sw &= ~(1 << idx);
} }
return 0; return 0;
} }
@ -274,13 +273,12 @@ static int elem_read_route(selem_t *s, int dir, selem_ctl_type_t type)
memset(&ctl, 0, sizeof(ctl)); memset(&ctl, 0, sizeof(ctl));
if ((err = snd_hctl_elem_read(c->elem, &ctl)) < 0) if ((err = snd_hctl_elem_read(c->elem, &ctl)) < 0)
return err; return err;
s->str[dir].sw = 0;
for (idx = 0; idx < s->str[dir].channels; idx++) { for (idx = 0; idx < s->str[dir].channels; idx++) {
unsigned int idx1 = idx; unsigned int idx1 = idx;
if (idx >= c->values) if (idx >= c->values)
idx1 = 0; idx1 = 0;
if (ctl.value.integer.value[idx1 * c->values + idx1]) if (!ctl.value.integer.value[idx1 * c->values + idx1])
s->str[dir].sw |= 1 << idx; s->str[dir].sw &= ~(1 << idx);
} }
return 0; return 0;
} }
@ -315,16 +313,17 @@ static int selem_read(snd_mixer_elem_t *elem)
if (err < 0) if (err < 0)
return err; return err;
s->str[PLAY].sw = ~0;
if (s->ctls[CTL_PLAYBACK_SWITCH].elem) if (s->ctls[CTL_PLAYBACK_SWITCH].elem)
err = elem_read_switch(s, PLAY, CTL_PLAYBACK_SWITCH); err = elem_read_switch(s, PLAY, CTL_PLAYBACK_SWITCH);
else if (s->ctls[CTL_GLOBAL_SWITCH].elem) if (s->ctls[CTL_GLOBAL_SWITCH].elem)
err = elem_read_switch(s, PLAY, CTL_GLOBAL_SWITCH); err = elem_read_switch(s, PLAY, CTL_GLOBAL_SWITCH);
else if (s->ctls[CTL_SINGLE].elem && if (s->ctls[CTL_SINGLE].elem &&
s->ctls[CTL_SINGLE].type == SND_CTL_ELEM_TYPE_BOOLEAN) s->ctls[CTL_SINGLE].type == SND_CTL_ELEM_TYPE_BOOLEAN)
err = elem_read_switch(s, PLAY, CTL_SINGLE); err = elem_read_switch(s, PLAY, CTL_SINGLE);
else if (s->ctls[CTL_PLAYBACK_ROUTE].elem) if (s->ctls[CTL_PLAYBACK_ROUTE].elem)
err = elem_read_route(s, PLAY, CTL_PLAYBACK_ROUTE); err = elem_read_route(s, PLAY, CTL_PLAYBACK_ROUTE);
else if (s->ctls[CTL_GLOBAL_ROUTE].elem) if (s->ctls[CTL_GLOBAL_ROUTE].elem)
err = elem_read_route(s, PLAY, CTL_GLOBAL_ROUTE); err = elem_read_route(s, PLAY, CTL_GLOBAL_ROUTE);
if (err < 0) if (err < 0)
return err; return err;
@ -339,18 +338,19 @@ static int selem_read(snd_mixer_elem_t *elem)
if (err < 0) if (err < 0)
return err; return err;
s->str[CAPT].sw = ~0;
if (s->ctls[CTL_CAPTURE_SWITCH].elem) if (s->ctls[CTL_CAPTURE_SWITCH].elem)
err = elem_read_switch(s, CAPT, CTL_CAPTURE_SWITCH); err = elem_read_switch(s, CAPT, CTL_CAPTURE_SWITCH);
else if (s->ctls[CTL_GLOBAL_SWITCH].elem) if (s->ctls[CTL_GLOBAL_SWITCH].elem)
err = elem_read_switch(s, CAPT, CTL_GLOBAL_SWITCH); err = elem_read_switch(s, CAPT, CTL_GLOBAL_SWITCH);
else if (s->ctls[CTL_SINGLE].elem && if (s->ctls[CTL_SINGLE].elem &&
s->ctls[CTL_SINGLE].type == SND_CTL_ELEM_TYPE_BOOLEAN) s->ctls[CTL_SINGLE].type == SND_CTL_ELEM_TYPE_BOOLEAN)
err = elem_read_switch(s, CAPT, CTL_SINGLE); err = elem_read_switch(s, CAPT, CTL_SINGLE);
else if (s->ctls[CTL_CAPTURE_ROUTE].elem) if (s->ctls[CTL_CAPTURE_ROUTE].elem)
err = elem_read_route(s, CAPT, CTL_CAPTURE_ROUTE); err = elem_read_route(s, CAPT, CTL_CAPTURE_ROUTE);
else if (s->ctls[CTL_GLOBAL_ROUTE].elem) if (s->ctls[CTL_GLOBAL_ROUTE].elem)
err = elem_read_route(s, CAPT, CTL_GLOBAL_ROUTE); err = elem_read_route(s, CAPT, CTL_GLOBAL_ROUTE);
else if (s->ctls[CTL_CAPTURE_SOURCE].elem) { if (s->ctls[CTL_CAPTURE_SOURCE].elem) {
snd_ctl_elem_value_t ctl; snd_ctl_elem_value_t ctl;
selem_ctl_t *c = &s->ctls[CTL_CAPTURE_SOURCE]; selem_ctl_t *c = &s->ctls[CTL_CAPTURE_SOURCE];
memset(&ctl, 0, sizeof(ctl)); memset(&ctl, 0, sizeof(ctl));
@ -1272,7 +1272,7 @@ int snd_mixer_selem_has_playback_switch(snd_mixer_elem_t *elem)
assert(elem); assert(elem);
assert(elem->type == SND_MIXER_ELEM_SIMPLE); assert(elem->type == SND_MIXER_ELEM_SIMPLE);
s = elem->private_data; s = elem->private_data;
return !!(s->caps & CAP_PSWITCH) && !!(s->caps & CAP_GSWITCH); return !!(s->caps & CAP_PSWITCH) || !!(s->caps & CAP_GSWITCH);
} }
/** /**