mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-02-20 01:40:25 -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

7
src/modules/alsa/alsa-ucm.c
View file

@ -1426,21 +1426,20 @@ static void profile_finalize_probing(pa_alsa_profile *p) {
static void ucm_mapping_jack_probe(pa_alsa_mapping *m) {
snd_pcm_t *pcm_handle;
snd_mixer_t *mixer_handle;
snd_hctl_t *hctl_handle;
pa_alsa_ucm_mapping_context *context = &m->ucm_context;
pa_alsa_ucm_device *dev;
uint32_t idx;
pcm_handle = m->direction == PA_ALSA_DIRECTION_OUTPUT ? m->output_pcm : m->input_pcm;
mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL, &hctl_handle);
if (!mixer_handle || !hctl_handle)
mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL);
if (!mixer_handle)
return;
PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
pa_alsa_jack *jack;
jack = m->direction == PA_ALSA_DIRECTION_OUTPUT ? dev->output_jack : dev->input_jack;
pa_assert (jack);
jack->has_control = pa_alsa_find_jack(hctl_handle, jack->alsa_name) != NULL;
jack->has_control = pa_alsa_mixer_find(mixer_handle, jack->alsa_name, 0) != NULL;
pa_log_info("UCM jack %s has_control=%d", jack->name, jack->has_control);
}