mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
On recommendation of Takashi Iwai prefer Master volume control over PCM and don't control Mic control
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1564 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
d3eca287cf
commit
9a4e84ade9
2 changed files with 2 additions and 2 deletions
|
|
@ -769,7 +769,7 @@ int pa__init(pa_core *c, pa_module*m) {
|
||||||
else {
|
else {
|
||||||
|
|
||||||
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", "Master"))) {
|
!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM"))) {
|
||||||
|
|
||||||
snd_mixer_close(u->mixer_handle);
|
snd_mixer_close(u->mixer_handle);
|
||||||
u->mixer_handle = NULL;
|
u->mixer_handle = NULL;
|
||||||
|
|
|
||||||
|
|
@ -744,7 +744,7 @@ int pa__init(pa_core *c, pa_module*m) {
|
||||||
else {
|
else {
|
||||||
|
|
||||||
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", "Mic"))) {
|
!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", NULL))) {
|
||||||
snd_mixer_close(u->mixer_handle);
|
snd_mixer_close(u->mixer_handle);
|
||||||
u->mixer_handle = NULL;
|
u->mixer_handle = NULL;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue