On recommendation of Takashi Iwai prefer Master volume control over PCM and don't...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1564 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 551bad8..9fd01e4 100644 (file)
--- 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 c2dad6f..b2b0698 100644 (file)
--- 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;
         }