reviewed for release

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1209 b3059339-0415-0410-9bf9-f77b7e298cf2

12 files changed, 30 insertions, 38 deletions

diff --git a/DOCS/DGA b/DOCS/DGA
index bbd01cad61..eb4a966a6c 100644
--- a/DOCS/DGA
+++ b/DOCS/DGA
@@ -67,7 +67,7 @@ Contents
 ~~~~~~~~~~~~~~~~
 
  DGA is used in two places with MPlayer: The SDL driver can be made to make
- use of it (-vo sdl -sdl dga) and within the DGA driver (-vo dga).
+ use of it (-vo sdl:dga) and within the DGA driver (-vo dga).
  The above said is true for both; in the following sections I'll explain
  how the DGA driver for MPlayer works.
 
diff --git a/DOCS/Hungarian/DGA b/DOCS/Hungarian/DGA
index f07806eb4a..8df5e7fee6 100644
--- a/DOCS/Hungarian/DGA
+++ b/DOCS/Hungarian/DGA
@@ -60,7 +60,7 @@ Tartalom
 ~~~~~~~~~~~~~~~~
 
  Az MPlayer-ben két helyen lehet DGA-t használni: az SDL driverben
- (-vo sdl -sdl dga), valamint a DGA driverben (-vo dga). A fentiek mindkettőre
+ (-vo sdl:dga), valamint a DGA driverben (-vo dga). A fentiek mindkettőre
  igazak; a következő néhány részben elmagyarazom, hogy is működik az MPlayer
  DGA drivere.
 
diff --git a/DOCS/Hungarian/MPlayer-FAQ b/DOCS/Hungarian/MPlayer-FAQ
index a69aba84a2..0b7c1f7462 100644
--- a/DOCS/Hungarian/MPlayer-FAQ
+++ b/DOCS/Hungarian/MPlayer-FAQ
@@ -134,7 +134,7 @@ Q: És mi lesz a DGA driverrel? Nem találom!!!
 A: ./configure automatikusan detektálja hogy van-e DGA-d. Ha a '-vo help'
    opció nem mutat DGA-t, akkor nincs jól felinstallálva az X-ed.
    Próbáld így: ./configure --enable-dga (és olvasd el a VIDEOCARDS file-t)
-   Esetleg próbáld az SDL DGA driverét, a '-vo sdl -sdl dga' opciókkal!
+   Esetleg próbáld az SDL DGA driverét, a '-vo sdl:dga' opciókkal!
 
 Q: Oké, -vo help mutatja a DGA drivert, de valami "permissions"-ről beszél!
    Segíts!
diff --git a/DOCS/Hungarian/SOUNDCARDS b/DOCS/Hungarian/SOUNDCARDS
index 82d160528b..643dba1b14 100644
--- a/DOCS/Hungarian/SOUNDCARDS
+++ b/DOCS/Hungarian/SOUNDCARDS
@@ -44,7 +44,6 @@ PC Speaker or DAC:
 			Max kHz : 6 ;) (a driver 44.1Khz-t emulál, vagy többet)
 			Driver  : ftp://ftp.infradead.org/pub/pcsp
 
- - MPlayer OSS-hez készül, legalábbis amíg át nem váltunk libxmm-re
  - a 2.4-es kerneleket használd, 2.2 nincs tesztelve !
  - ha kattog a hang és CD-ROM-ról játszol le, kapcsold be az IRQ
    unmasking-ot !
diff --git a/DOCS/Hungarian/VIDEOCARDS b/DOCS/Hungarian/VIDEOCARDS
index 334df8edd7..5dfa4331ad 100644
--- a/DOCS/Hungarian/VIDEOCARDS
+++ b/DOCS/Hungarian/VIDEOCARDS
@@ -172,7 +172,7 @@ az fps-t a DGA driverrel:
    a suid MPlayer-en keresztül.
    !!!! ÉN FIGYELMEZTETTELEK ... !!!!
 5. Használd a '-vo dga' opciót, és már megy is! (remélhetőleg :)
-6. Próbáld ki, hogy a '-vo sdl -sdl dga' opció működik-e nálad!
+6. Próbáld ki, hogy a '-vo sdl:dga' opció működik-e nálad!
    Sokkal gyorsabb!!!
 
 Ha gyors géped van (pl. P3 800) próbáld ki az 'fsdga'-t, így teljesképernyős
@@ -207,7 +207,7 @@ b, Framebuffer-t akarsz használni...
   Megj.: az FBdev output videomód váltása _nem működik_ a VESA
          framebuffer-rel, és ne is kérd, mivel ez nem az MPlayer korlátja!
 
-c, Érdemes továbbá kipróbálni az 'aalib' outputot ('-vo sdl -sdl aalib'),
+c, Érdemes továbbá kipróbálni az 'aalib' outputot ('-vo sdl:aalib'),
   igazán nagyszerű! :)
 
 
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index 7c149827f6..21cf6dec83 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -133,7 +133,7 @@ Q: What about DGA driver? I can't find it!!!
 A: ./configure autodetects your DGA driver. If -vo help doesn't show
    DGA, then there's a problem with your X installation.
    Try ./configure --enable-dga (and read VIDEOCARDS)
-   Alternatively, try SDL's DGA driver with '-vo sdl -sdl dga' options.
+   Alternatively, try SDL's DGA driver with '-vo sdl:dga' options.
 
 Q: Ok, -vo help shows DGA driver, but it is babbling about permissions!
    Help me!
diff --git a/DOCS/SDL b/DOCS/SDL
index fce3ba0c55..f91a0654fd 100644
--- a/DOCS/SDL
+++ b/DOCS/SDL
@@ -1,9 +1,9 @@
 Here are some notes about SDL out in MPlayer.
 
 There are several commandline switches for sdl:
--sdl <name>	specifies sdl video driver to use (ie. aalib,
+-vo sdl:<name>	specifies sdl video driver to use (ie. aalib,
 		dga, x11)
--sdla <name>	specifies sdl audio driver to use (ie. dsp, esd)
+-ao sdl:<name>	specifies sdl audio driver to use (ie. dsp, esd)
 -noxv		disables Xvideo hardware acceleration
 -forcexv	tries to force Xvideo acceleration
 
diff --git a/DOCS/SOUNDCARDS b/DOCS/SOUNDCARDS
index d630a85b9b..ad3eaf7008 100644
--- a/DOCS/SOUNDCARDS
+++ b/DOCS/SOUNDCARDS
@@ -44,7 +44,6 @@ PC Speaker or DAC:
 			Max kHz : 6 ;) (the driver emulates 44.1 maybe more)
 			Driver  : ftp://ftp.infradead.org/pub/pcsp
 
- - MPlayer is mostly intended for OSS, until we change to libxmm
  - use at least 2.4 if possible, 2.2 isn't tested
  - if sound clicks when playing from CD-ROM, turn on IRQ unmasking !
    for example "hdparm -u1 /dev/cdrom" (see "man hdparm" !!!)
diff --git a/DOCS/SUB+OSD b/DOCS/SUB+OSD
index e594cc950f..6fd7b4bbf6 100644
--- a/DOCS/SUB+OSD
+++ b/DOCS/SUB+OSD
@@ -15,11 +15,9 @@ INSTALLING OSD and SUB
 @ download fonts from mplayer's download page                            @
 @  mplayer.sourceforge.net/homepage/dload.html                           @
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-english, hungarian, czech fonts:
-	http://thot.banki.hu/mp-ftp/releases/mp_font1.zip
-
-english, hungarian, german, czech fonts: (not good for hungarian at least for me)
-	http://thot.banki.hu/mp-ftp/releases/mp_font2.zip
+Standard (Central-European, Latin1) font package:
+	http://thot.banki.hu/mp-ftp/releases/mp_font3.zip
+	(it obsoletes mp_font1.zip and mp_font2.zip)
 
 Cyrillic fonts:
 	http://thot.banki.hu/mp-ftp/releases/bgfont.zip
diff --git a/DOCS/VIDEOCARDS b/DOCS/VIDEOCARDS
index 0864f63355..b1625c2da8 100644
--- a/DOCS/VIDEOCARDS
+++ b/DOCS/VIDEOCARDS
@@ -160,7 +160,7 @@ using the DGA driver:
    privilegies through suid root mplayer.
    !!!! SO YOU HAVE BEEN WARNED ... !!!!
 5. Use '-vo dga' option, and there you go! (hope so:)
-6. Try if the '-vo sdl -sdl dga' options work for you! It's much faster!!!
+6. Try if the '-vo sdl:dga' options work for you! It's much faster!!!
 
 If you have fast enough CPU (P3 800 for example) you can try fsdga for
 fullscreen mpeg playing (using software YUV->RGB scaling):
@@ -179,7 +179,7 @@ a, If you don't have X...
   forced), and don't forget to edit /etc/vga/libvga.config to suit your
   card & monitor.
 
-  Try the aalib target ('-vo sdl -sdl aalib'), it's great! :)
+  Try the aalib target ('-vo sdl:aalib'), it's great! :)
 
 b, You want to use framebuffer...
   ... Whether to build the FBdev target is autodetected during ./configure .
diff --git a/DOCS/example.conf b/DOCS/example.conf
index 8e233795be..db918e7653 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -81,16 +81,17 @@ ffactor = 0.75
 ## SDL driver
 ##
 
-# vo = sdl		# use SDL video driver by default
+# vo = sdl:aalib	# use SDL video driver by default
 			# use "vo = sdl:aalib" or "vo sdl:dga" and so on,
 			# for specifying SDL subdrivers
-# ao = sdl		# use SDL audio driver by default
+# ao = sdl:esd		# use SDL audio driver by default
 			# use "ao = sdl:esd" to use SDL's ESD driver
 # noxv = no		# whether to use XVideo hardware acceleration or not
 # forcexv = yes		# force XVideo even if not detected
 
 # nodshow		# disable usage of DirectShow video codecs
 
+
 framedrop = yes		# drop frames, when not in sync (slow CPU, videocard,
 			  etc)
 
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index b96afd3262..398ace30e5 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -6,8 +6,8 @@
 mplayer \- Movie Player for Linux
 .SH SYNOPSIS
 .B mplayer
-.RB [ \-vo\ output\ driver ]
-.RB [ \-ao\ output\ driver ]
+.RB [ \-vo\ <driver>[:<subdriver>]\ ]
+.RB [ \-ao\ <driver>[:<subdriver>]\ ]
 .RB [ \-vcd\ track\ number ]
 .RB [ \-sb\ byte\ position ]
 .RB [ \-nosound\ ]
@@ -25,7 +25,6 @@ mplayer \- Movie Player for Linux
 .RB [ \-x\ x ]
 .RB [ \-y\ y ]
 .RB [ \-xy\ factor ]
-.RB [ \-dsp\ device ]
 .RB [ \-pp\ quality ]
 .RB [ \-include\ configfile ]
 .RB [ \-lircconf\ configfile ]
@@ -38,8 +37,6 @@ mplayer \- Movie Player for Linux
 .RB [ \-idx ]
 .RB [ \-forceidx ]
 .RB [ \-nodshow ]
-.RB [ \-sdl\ driver ]
-.RB [ \-sdla\ driver ]
 .RB [ \-noxv ]
 .RB [ \-forcexv ]
 .RB [ \-ss\ sec ]
@@ -77,15 +74,22 @@ any options.
 .I NOTE
 Every "flag" option has "noflag" pair, e.g. -fs opposite is -nofs
 .TP
-.B \-vo\ video\ output\ driver
-select video output driver
+.B \-vo\ <driver>[:<subdriver>]
+select video output driver. "subdriver" is valid only when you specify
+a driver like SDL or GGI, which use alternative means to produce video.
+Like: -vo sdl:aalib (or dga, fbdev, svga, x11, ggi)
 
 you can get the list of available drivers executing
 .I mplayer -vo help
 
 .TP
-.B \-ao\ audio\ output\ driver
-select audio output driver
+.B \-ao\ <driver>[:<subdriver>]
+select audio output driver. "subdriver" is valid only when you specify
+SDL as driver, which uses alternative means to produce audio.
+Like: -vo sdl:esd (or arts)
+
+If using OSS, you can specify which sound device to use like this :
+-ao oss:/dev/dsp0
 
 you can get the list of available drivers executing
 .I mplayer -ao help
@@ -120,9 +124,6 @@ scale image to y height
 .B \-xy\ factor
 scale image by <factor>
 .TP
-.B \-dsp\ device
-select another DSP output device
-.TP
 .B \-pp\ quality
 apply postprocess filter on decoded image.
 You need a STRONG CPU in order to use this!
@@ -160,7 +161,7 @@ delays subtitles by <sec> seconds. Can be negative.
 .B \-osdlevel\ level
 specifies which mode the OSD should start in (0 : none, 1 : seek, 2: seek+timer)
 (default = 2)
-.IP
+.TP
 .B \-lircconf\ configfile
 specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc 
 .IP
@@ -226,12 +227,6 @@ indexes.
 .B \-nodshow
 disables usage of DirectShow video codecs
 .TP
-.B \-sdl\ driver
-specify SDL video driver to use. For example: aalib, dga, fbdev, svga, x11, ggi
-.TP
-.B \-sdla\ driver
-specify SDL audio driver to use. For example: esd
-.TP
 .B \-noxv
 disable XVideo hardware acceleration (with SDL only!)
 .TP