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

unify ALSA mixer initialization

Browse source
This commit is contained in:
Lennart Poettering 2009-02-14 00:21:36 +01:00
parent 023998e3c8
commit 6790c03f91
4 changed files with 83 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/modules/alsa/alsa-sink.c
View file

@ -1386,43 +1386,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
/* ALSA might tweak the sample spec, so recalculate the frame size */
frame_size = pa_frame_size(&ss);
if ((err = snd_mixer_open(&u->mixer_handle, 0)) < 0)
pa_log_warn("Error opening mixer: %s", snd_strerror(err));
else {
pa_bool_t found = FALSE;
if (pa_alsa_prepare_mixer(u->mixer_handle, u->device_name) >= 0)
found = TRUE;
else {
snd_pcm_info_t *info;
snd_pcm_info_alloca(&info);
if (snd_pcm_info(u->pcm_handle, info) >= 0) {
char *md;
int card_idx;
if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
md = pa_sprintf_malloc("hw:%i", card_idx);
if (strcmp(u->device_name, md))
if (pa_alsa_prepare_mixer(u->mixer_handle, md) >= 0)
found = TRUE;
pa_xfree(md);
}
}
}
if (found)
if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM", TRUE)))
found = FALSE;
if (!found) {
snd_mixer_close(u->mixer_handle);
u->mixer_handle = NULL;
}
}
pa_alsa_find_mixer_and_elem(u->pcm_handle, &u->mixer_handle, &u->mixer_elem);
pa_sink_new_data_init(&data);
data.driver = driver;