[MPlayer-DOCS] CVS: main/DOCS/man/en mplayer.1,1.617,1.618

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/DOCS/man/en
In directory mail:/var2/tmp/cvs-serv30731

Modified Files:
	mplayer.1 
Log Message:
ao_alsa now uses -mixer-channel instead of its special -mixer syntax


Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -r1.617 -r1.618
--- mplayer.1	1 Jul 2004 10:51:22 -0000	1.617
+++ mplayer.1	2 Jul 2004 13:10:58 -0000	1.618
@@ -1536,14 +1536,17 @@
 .B \-mixer <device>
 This option will tell MPlayer to use a different device for mixing than
 /dev/\:mixer.
+For ALSA this is the mixer name.
 .TP
-.B \-mixer-channel <mixer line> (\-ao oss only)
+.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.