mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-29 05:40:25 -04:00
Removed Capture Source exceptions. Renamed snd_hctl_elem_get_handle
This commit is contained in:
parent
cba5c929ec
commit
db53ac9b41
3 changed files with 2 additions and 20 deletions
|
|
@ -238,7 +238,7 @@ int snd_hctl_elem_info(snd_hctl_elem_t *elem, snd_ctl_elem_info_t * info);
|
||||||
int snd_hctl_elem_read(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value);
|
int snd_hctl_elem_read(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value);
|
||||||
int snd_hctl_elem_write(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value);
|
int snd_hctl_elem_write(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value);
|
||||||
|
|
||||||
snd_hctl_t *snd_hctl_elem_get_handle(snd_hctl_elem_t *elem);
|
snd_hctl_t *snd_hctl_elem_get_hctl(snd_hctl_elem_t *elem);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -552,7 +552,7 @@ int snd_hctl_elem_write(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value)
|
||||||
return snd_ctl_elem_write(elem->hctl->ctl, value);
|
return snd_ctl_elem_write(elem->hctl->ctl, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
snd_hctl_t *snd_hctl_elem_get_handle(snd_hctl_elem_t *elem)
|
snd_hctl_t *snd_hctl_elem_get_hctl(snd_hctl_elem_t *elem)
|
||||||
{
|
{
|
||||||
assert(elem);
|
assert(elem);
|
||||||
return elem->hctl;
|
return elem->hctl;
|
||||||
|
|
|
||||||
|
|
@ -743,24 +743,6 @@ int simple_event_add(snd_mixer_class_t *class, snd_hctl_elem_t *helem)
|
||||||
err = snd_hctl_elem_info(helem, info);
|
err = snd_hctl_elem_info(helem, info);
|
||||||
assert(err >= 0);
|
assert(err >= 0);
|
||||||
n = snd_ctl_elem_info_get_item_name(info);
|
n = snd_ctl_elem_info_get_item_name(info);
|
||||||
if (!strcmp(n, "Mix") || !strcmp(n, "Mono Mix")) {
|
|
||||||
snd_hctl_t *hctl;
|
|
||||||
hctl = snd_hctl_elem_get_handle(helem);
|
|
||||||
if (hctl != NULL) {
|
|
||||||
snd_ctl_elem_id_t *eid;
|
|
||||||
snd_ctl_elem_id_alloca(&eid);
|
|
||||||
snd_ctl_elem_id_set_interface(eid, SND_CTL_ELEM_IFACE_MIXER);
|
|
||||||
if (!strcmp(n, "Mix")) {
|
|
||||||
snd_ctl_elem_id_set_name(eid, "Mix");
|
|
||||||
if (snd_hctl_find_elem(hctl, eid) == NULL)
|
|
||||||
n = "Master";
|
|
||||||
} else if (!strcmp(n, "Mono Mix")) {
|
|
||||||
snd_ctl_elem_id_set_name(eid, "Mono Mix");
|
|
||||||
if (snd_hctl_find_elem(hctl, eid) == NULL)
|
|
||||||
n = "Master Mono";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
err = simple_add1(class, n, helem, CTL_CAPTURE_SOURCE, k);
|
err = simple_add1(class, n, helem, CTL_CAPTURE_SOURCE, k);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue