mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* alsa-sink: if "PCM" is not found as mixer track name, fallback to "Master"

Browse source 
* alsa-source: if "Capture" is not found as mixer track name, fallback to "Mic"


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@993 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-30 22:48:17 +00:00
parent bb820db4b5
commit 64fa5b882f
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/alsa-util.c
View file

@ -337,18 +337,29 @@ int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
return 0; return 0;
} }
snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name) { snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback) {
snd_mixer_elem_t *elem; snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid; snd_mixer_selem_id_t *sid = NULL;
snd_mixer_selem_id_alloca(&sid); snd_mixer_selem_id_alloca(&sid);
assert(mixer && name); assert(mixer);
assert(name);
snd_mixer_selem_id_set_name(sid, name); snd_mixer_selem_id_set_name(sid, name);
elem = snd_mixer_find_selem(mixer, sid); if (!(elem = snd_mixer_find_selem(mixer, sid))) {
if (!elem) pa_log_warn(__FILE__": Cannot find mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
pa_log_warn(__FILE__": Cannot find mixer control %s", snd_mixer_selem_id_get_name(sid));
if (fallback) {
snd_mixer_selem_id_set_name(sid, fallback);
if (!(elem = snd_mixer_find_selem(mixer, sid)))
pa_log_warn(__FILE__": Cannot find fallback mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
}
}
if (elem)
pa_log_warn(__FILE__": Using mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
return elem; return elem;
} }

2
src/modules/alsa-util.h
View file

@ -40,6 +40,6 @@ int pa_alsa_fdlist_init_mixer(struct pa_alsa_fdlist *fdl, snd_mixer_t *mixer_han
int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size); int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size);
int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev); int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev);
snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name); snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback);
#endif #endif

2
src/modules/module-alsa-sink.c
View file

@ -373,7 +373,7 @@ int pa__init(pa_core *c, pa_module*m) {
} }
if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) || if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) ||
!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "PCM"))) { !(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "PCM", "Master"))) {
snd_mixer_close(u->mixer_handle); snd_mixer_close(u->mixer_handle);
u->mixer_handle = NULL; u->mixer_handle = NULL;
} }

2
src/modules/module-alsa-source.c
View file

@ -366,7 +366,7 @@ int pa__init(pa_core *c, pa_module*m) {
} }
if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) || if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) ||
!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture"))) { !(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", "Mic"))) {
snd_mixer_close(u->mixer_handle); snd_mixer_close(u->mixer_handle);
u->mixer_handle = NULL; u->mixer_handle = NULL;
} }