diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-08-03 22:39:18 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-08-03 22:39:18 +0000 |
| commit | 9a4e84ade9b0d5978cd0649ed3adc0d5a94c2e3d (patch) | |
| tree | 06cf6bd5ed3464154c949ee958dbf54f7204b5e9 | |
| parent | d3eca287cfc177fc5084ddf72ccfdbe9bee23cae (diff) | |
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
| -rw-r--r-- | src/modules/module-alsa-sink.c | 2 | ||||
| -rw-r--r-- | src/modules/module-alsa-source.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index 551bad89..9fd01e4d 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -769,7 +769,7 @@ int pa__init(pa_core *c, pa_module*m) { else { 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); u->mixer_handle = NULL; diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index c2dad6f9..b2b0698a 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -744,7 +744,7 @@ int pa__init(pa_core *c, pa_module*m) { else { 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); u->mixer_handle = NULL; } |