mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: Remove unnecessary hctl handles being passed around

Browse source 
Now that we have switched to using the mixer handle only,
there is no use for sending hctl handles around.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2014-09-01 15:58:22 +02:00
parent f2120fc2b6
commit 300a5e3ed7
8 changed files with 28 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/alsa/module-alsa-card.c
View file

@ -111,7 +111,6 @@ struct userdata {
int alsa_card_index;
snd_mixer_t *mixer_handle;
snd_hctl_t *hctl_handle;
pa_hashmap *jacks;
pa_alsa_fdlist *mixer_fdl;
@ -422,7 +421,7 @@ static int hdmi_eld_changed(snd_mixer_elem_t *melem, unsigned int mask) {
return 0;
}
if (pa_alsa_get_hdmi_eld(u->hctl_handle, device, &eld) < 0)
if (pa_alsa_get_hdmi_eld(elem, &eld) < 0)
memset(&eld, 0, sizeof(eld));
old_monitor_name = pa_proplist_gets(p->proplist, PA_PROP_DEVICE_PRODUCT_NAME);
@ -444,7 +443,7 @@ static void init_eld_ctls(struct userdata *u) {
void *state;
pa_device_port *port;
if (!u->hctl_handle)
if (!u->mixer_handle)
return;
PA_HASHMAP_FOREACH(port, u->card->ports, state) {
@ -501,7 +500,7 @@ static void init_jacks(struct userdata *u) {
u->mixer_fdl = pa_alsa_fdlist_new();
u->mixer_handle = pa_alsa_open_mixer(u->alsa_card_index, NULL, &u->hctl_handle);
u->mixer_handle = pa_alsa_open_mixer(u->alsa_card_index, NULL);
if (u->mixer_handle && pa_alsa_fdlist_set_handle(u->mixer_fdl, u->mixer_handle, NULL, u->core->mainloop) >= 0) {
PA_HASHMAP_FOREACH(jack, u->jacks, state) {
jack->melem = pa_alsa_mixer_find(u->mixer_handle, jack->alsa_name, 0);
@ -516,7 +515,7 @@ static void init_jacks(struct userdata *u) {
}
} else
pa_log("Failed to open hctl/mixer for jack detection");
pa_log("Failed to open mixer for jack detection");
}