[MPlayer-DOCS] CVS: main/DOCS/man/en mplayer.1,1.614,1.615

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	mplayer.1 
Log Message:
ao_alsa and ao_oss documented.


Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- mplayer.1	30 Jun 2004 14:27:33 -0000	1.614
+++ mplayer.1	1 Jul 2004 10:09:06 -0000	1.615
@@ -1569,15 +1569,16 @@
 .RSs
 .IPs "\-ao alsa,oss,"
 Try the ALSA driver, then the OSS driver, then others.
-.br
-.IPs "\-ao sdl:esd"
-Use the SDL driver with the ESD subdriver.
+.IPs "\-ao alsa:mmap:noblock:hw=0.3"
+Sets noblock-mode, mmap-mode and the device-name as first card, fourth device.
 .RE
 .PD 1
 .
 
+FIXME: Document suboptions for sdl, arts, esd, jack, nas, macosx, sgi, sun,
+win32, dxr2, mpegpes, null, pcm, plugin.
+
 Available audio output drivers are:
-FIXME: Document all suboptions.
 .
 .TP
 .B alsa\ \ \ 
@@ -1588,22 +1589,31 @@
 Sets experimental mmap-mode (does not work for more than 2 channels).
 .IPs noblock
 Sets noblock-mode.
-.IPs hw=device0.3
+.IPs hw=<device>
 Sets the device name.
+Replace the ',' with a '.' in the ALSA device name.
 .RE
 .PD 1
 .TP
-.B alsa1x\ 
+.B alsa1x (OBSOLETE)
 ALSA 1.x audio output driver.
+Obsoleted by the general alsa audio output driver.
 .TP
-.B alsa9\ \ 
+.B alsa9 (OBSOLETE)
 ALSA 0.9 audio output driver.
+Obsoleted by the general alsa audio output driver.
 .TP
 .B alsa5\ \ 
 ALSA 0.5 audio output driver.
 .TP
 .B oss\ \ \ \ 
 OSS audio output driver
+.PD 0
+.RSs
+.IPs dsp-device
+Sets the audio-output device (default: /dev/dsp).
+.RE
+.PD 1
 .TP
 .B sdl\ \ \ \ 
 Highly platform independent SDL (Simple Directmedia Layer) library