# HG changeset patch
# User diego
# Date 1041634578 0
# Node ID f117a4150786dbb53ddc225a3ac0f72801422ef7
# Parent  f6323ff433aaff89c11d62118632c5072bd6f85c
We now have -ao esd.

diff -r f6323ff433aa -r f117a4150786 DOCS/faq.html
--- a/DOCS/faq.html	Fri Jan 03 22:29:16 2003 +0000
+++ b/DOCS/faq.html	Fri Jan 03 22:56:18 2003 +0000
@@ -558,9 +558,9 @@
     Start playing...
     </PRE>
   </DT>
-  <DD>A: Are you running KDE or GNOME with the arts or esd sound daemon? Try
-    disabling the sound daemon, or use the <CODE>-ao arts</CODE> switch to make
-    MPlayer use arts.</DD>
+  <DD>A: Are you running KDE or GNOME with the ARTS or ESD sound daemon? Try
+    disabling the sound daemon or use the <CODE>-ao arts</CODE> or
+    <CODE>-ao esd</CODE> switch to make MPlayer use ARTS or ESD.</DD>
   <DD>&nbsp;</DD>
 
   <DT>Q: What about the DGA driver? I can't find it!</DT>
diff -r f6323ff433aa -r f117a4150786 DOCS/sound.html
--- a/DOCS/sound.html	Fri Jan 03 22:29:16 2003 +0000
+++ b/DOCS/sound.html	Fri Jan 03 22:56:18 2003 +0000
@@ -17,16 +17,31 @@
 <P>MPlayer's audio interface is called <I>libao2</I>. It currently
   contains these drivers:</P>
 
-<TABLE BORDER="0">
-  <TR><TD COLSPAN=4><P><B>General:</B></P></TD></TR>
-  <TR><TD>&nbsp;&nbsp;</TD><TD VALIGN=top>oss</TD><TD>&nbsp;&nbsp;</TD><TD>OSS (ioctl) driver (supports hardware AC3 passthrough)</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>sdl</TD><TD></TD><TD>SDL driver (supports <B>ESD</B>, <B>ARTS</B> etc)</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>nas</TD><TD></TD><TD>NAS (Network Audio System) driver</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>alsa5</TD><TD></TD><TD>native ALSA 0.5 driver</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>alsa9</TD><TD></TD><TD>native ALSA 0.9 driver (supports hardware AC3 passthrough)</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>sun</TD><TD></TD><TD>SUN audio driver (<CODE>/dev/audio</CODE>) for BSD and Solaris8 users</TD></TR>
-  <TR><TD></TD><TD VALIGN=top>arts</TD><TD></TD><TD>native ARTS driver (mostly for KDE users)</TD></TR>
-</TABLE>
+<DL>
+  <DT>oss</DT>
+  <DD>OSS (ioctl) driver (supports hardware AC3 passthrough)</DD>
+
+  <DT>sdl</DT>
+  <DD>SDL driver (supports <B>ESD</B>, <B>ARTS</B> etc)</DD>
+
+  <DT>nas</DT>
+  <DD>NAS (Network Audio System) driver</DD>
+
+  <DT>alsa5</DT>
+  <DD>native ALSA 0.5 driver</DD>
+
+  <DT>alsa9</DT>
+  <DD>native ALSA 0.9 driver (supports hardware AC3 passthrough)</DD>
+
+  <DT>sun</DT>
+  <DD>SUN audio driver (<CODE>/dev/audio</CODE>) for BSD and Solaris8 users</DD>
+
+  <DT>arts</DT>
+  <DD>native ARTS driver (mostly for KDE users)</DD>
+
+  <DT>esd</DT>
+  <DD>native ESD driver (mostly for GNOME users)</DD>
+</DL>
 
 <P>Fact is, Linux sound card drivers have compatibility problems. The cause
   is that MPlayer uses a feature that well coded audio drivers implement to
@@ -77,7 +92,7 @@
   <TR><TD></TD><TD>ALSA:</TD><TD>no driver</TD></TR>
   <TR><TD></TD><TD>Max kHz:</TD><TD>48</TD></TR>
   <TR><TD></TD><TD>Driver:</TD><TD><A HREF="http://aureal.sourceforge.net">aureal.sourceforge.net</A></TD></TR>
-  <TR><TD></TD><TD>Driver2:</TD><TD> from <A HREF="http://makacs.poliod.hu/~pontscho/aureal/au88xx-1.1.3.tar.bz2">Pontscho's page</A><BR>
+  <TR><TD></TD><TD>Driver2:</TD><TD> from <A HREF="http://makacs.poliod.hu/~pontscho/aureal/au88xx-1.1.3.tar.bz2">Pontscho's page</A>
     (<I>buffer size increased to 32k</I>)</TD></TR>
 
   <TR><TD COLSPAN=3><B>GUS PnP</B></TD></TR>
@@ -141,12 +156,6 @@
   generally beneficial and described in more detail in the
   <A HREF="cd-dvd.html#drives">CD-ROM section</A>.</P>
 
-<P>Sharing your sound card with another application like XMMS is <B>strongly
-  discouraged</B>!  If the other sound application is using ESD, start
-  MPlayer with the <CODE>-vo sdl:esd</CODE> option to combine both
-  sound streams. In fact, the option <CODE>-vo sdl:esd</CODE> could be used
-  with ESD even when playing MPlayer alone.</P>
-
 <P>Feedback to this document is welcome. Please tell us how MPlayer
   and your sound card(s) worked together.</P>
 
@@ -208,7 +217,6 @@
       <DD>Use no automatic insertion of filters and no optimization. Warning: It
         may be possible to crash MPlayer using this setting.</DD>
     </DL>
-
   </DD>
   
   <DT><CODE>list</CODE></DT>