aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-03-08 00:54:37 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-03-08 00:54:37 +0000
commit8db09d0b766638cef7262f96d79d07a7b82fdf3f (patch)
tree453e201d2809aba7f62bd1fc131979e39a02612f
parent6a77e60c70d128af4b0fc0ea2a520e9b20411abc (diff)
downloadmpd-8db09d0b766638cef7262f96d79d07a7b82fdf3f.tar.gz
mpd-8db09d0b766638cef7262f96d79d07a7b82fdf3f.tar.xz
mpd-8db09d0b766638cef7262f96d79d07a7b82fdf3f.zip
make PCM the default controller for the mixer
git-svn-id: https://svn.musicpd.org/mpd/trunk@3035 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/volume.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/volume.c b/src/volume.c
index f97ee2d1b..c16938042 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -43,7 +43,7 @@
#define VOLUME_MIXER_SOFTWARE_DEFAULT ""
#define VOLUME_MIXER_OSS_DEFAULT "/dev/mixer"
#define VOLUME_MIXER_ALSA_DEFAULT "default"
-#define VOLUME_MIXER_ALSA_CONTROL_DEFAULT "Master"
+#define VOLUME_MIXER_ALSA_CONTROL_DEFAULT "PCM"
#ifdef HAVE_OSS
#define VOLUME_MIXER_TYPE_DEFAULT VOLUME_MIXER_TYPE_OSS
@@ -65,7 +65,7 @@ int volume_softwareSet = 100;
#ifdef HAVE_OSS
int volume_ossFd;
-int volume_ossControl = SOUND_MIXER_VOLUME;
+int volume_ossControl = SOUND_MIXER_PCM;
#endif
#ifdef HAVE_ALSA