[pulseaudio-commits] r1564 - in /branches/lennart/src/modules: module-alsa-sink.c module-alsa-source.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sat Aug  4 00:39:18 2007
New Revision: 1564

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1564&root=3Dpulseaudio&vi=
ew=3Drev
Log:
On recommendation of Takashi Iwai prefer Master volume control over PCM and=
 don't control Mic control

Modified:
    branches/lennart/src/modules/module-alsa-sink.c
    branches/lennart/src/modules/module-alsa-source.c

Modified: branches/lennart/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-alsa-sink.c?rev=3D1564&root=3Dpulseaudio&r1=3D1563&r2=3D1564&view=3Ddi=
ff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-alsa-sink.c (original)
+++ branches/lennart/src/modules/module-alsa-sink.c Sat Aug  4 00:39:18 2007
@@ -769,7 +769,7 @@
     else {
 =

         if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) ||
-            !(u->mixer_elem =3D pa_alsa_find_elem(u->mixer_handle, "PCM", =
"Master"))) {
+            !(u->mixer_elem =3D pa_alsa_find_elem(u->mixer_handle, "Master=
", "PCM"))) {
             =

             snd_mixer_close(u->mixer_handle);
             u->mixer_handle =3D NULL;

Modified: branches/lennart/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-alsa-source.c?rev=3D1564&root=3Dpulseaudio&r1=3D1563&r2=3D1564&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-alsa-source.c (original)
+++ branches/lennart/src/modules/module-alsa-source.c Sat Aug  4 00:39:18 2=
007
@@ -744,7 +744,7 @@
     else {
         =

         if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) ||
-            !(u->mixer_elem =3D pa_alsa_find_elem(u->mixer_handle, "Captur=
e", "Mic"))) {
+            !(u->mixer_elem =3D pa_alsa_find_elem(u->mixer_handle, "Captur=
e", NULL))) {
             snd_mixer_close(u->mixer_handle);
             u->mixer_handle =3D NULL;
         }