changeset 12748:f11bd27b0ff2

ao_alsa now uses -mixer-channel instead of its special -mixer syntax
author reimar
date Fri, 02 Jul 2004 13:10:58 +0000
parents 60c75c601bf1
children 86774b3d5ede
files DOCS/man/en/mplayer.1
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Fri Jul 02 04:30:46 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Fri Jul 02 13:10:58 2004 +0000
@@ -1536,14 +1536,17 @@
 .B \-mixer <device>
 This option will tell MPlayer to use a different device for mixing than
 /dev/\:mixer.
-.TP
-.B \-mixer-channel <mixer line> (\-ao oss only)
+For ALSA this is the mixer name.
+.TP
+.B \-mixer-channel <mixer line> (\-ao oss and \-ao alsa only)
 This option will tell MPlayer to use a different channel for controlling
 volume than the default PCM.
-Options include
+Options for OSS include
 .B vol, pcm, line.
 For a complete list of options look for SOUND_DEVICE_NAMES in
 /usr/include/linux/soundcard.h.
+For ALSA you can use the names e.g. alsamixer displays, like 
+.B Master, Line, PCM.
 .TP
 .B \-nowaveheader (\-ao pcm only)
 Don't include wave header.