Commit 06b3dec4 authored by Jerone Young's avatar Jerone Young Committed by Tim-Philipp Müller

ext/alsa/gstalsamixer.c: If there's no mixer track by the name of 'Master' or...

ext/alsa/gstalsamixer.c: If there's no mixer track by the name of 'Master' or 'Front', check if there's one called 'P...

Original commit message from CVS:
Patch by: Jerone Young <jerone at gmail com>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_find_master_mixer):
If there's no mixer track by the name of 'Master' or 'Front',
check if there's one called 'PCM' before trying the generic
fallback logic (fixes #506928, where we pick 'Mic' as master
track for the AD1984 card in a Thinkpad T61/X61 laptop).
parent 9c9f6077
2008-01-07 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Jerone Young <jerone at gmail com>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_find_master_mixer):
If there's no mixer track by the name of 'Master' or 'Front',
check if there's one called 'PCM' before trying the generic
fallback logic (fixes #506928, where we pick 'Mic' as master
track for the AD1984 card in a Thinkpad T61/X61 laptop).
2008-01-07 Wim Taymans <wim.taymans@collabora.co.uk> 2008-01-07 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/playback/gstplay-enum.c: * gst/playback/gstplay-enum.c:
...@@ -155,6 +155,16 @@ gst_alsa_mixer_find_master_mixer (GstAlsaMixer * mixer, snd_mixer_t * handle) ...@@ -155,6 +155,16 @@ gst_alsa_mixer_find_master_mixer (GstAlsaMixer * mixer, snd_mixer_t * handle)
element = snd_mixer_elem_next (element); element = snd_mixer_elem_next (element);
} }
/* If not, check if we have a playback mixer labelled as 'PCM' */
element = snd_mixer_first_elem (handle);
for (i = 0; i < count; i++) {
if (snd_mixer_selem_has_playback_volume (element) &&
strcmp (snd_mixer_selem_get_name (element), "PCM") == 0) {
return element;
}
element = snd_mixer_elem_next (element);
}
/* If not, check if we have a playback mixer with both volume and switch */ /* If not, check if we have a playback mixer with both volume and switch */
element = snd_mixer_first_elem (handle); element = snd_mixer_first_elem (handle);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment