[MPlayer-DOCS] r32860 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h mencoder.c mpcommon.h mplayer.c sub/subreader.c

[cboesch]

Author: cboesch
Date: Sat Feb  5 21:38:02 2011
New Revision: 32860

Log:
Add sub-paths option.

This option allows specifying extra subtitles (relative and absolute) paths to
track.

Modified:
   trunk/DOCS/man/en/mplayer.1

Changes in other areas also in this revision:
Modified:
   trunk/cfg-common.h
   trunk/mencoder.c
   trunk/mpcommon.h
   trunk/mplayer.c
   trunk/sub/subreader.c

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Sat Feb  5 21:05:38 2011	(r32859)
+++ trunk/DOCS/man/en/mplayer.1	Sat Feb  5 21:38:02 2011	(r32860)
@@ -2557,7 +2557,7 @@ exact match
 .IPs 1
 Load all subs containing movie name.
 .IPs 2
-Load all subs in the current directory.
+Load all subs in the current and \-sub\-paths directories.
 .RE
 .PD 1
 .
@@ -2624,6 +2624,27 @@ Guess the encoding for Polish, fall back
 .PD 1
 .
 .TP
+.B \-sub\-paths <path1,path2,...>
+Specify extra subtitle paths to track in the media directory.
+.sp 1
+.I EXAMPLE:
+Assuming that /path/\:to/\:movie/\:movie.avi is played and \-sub\-paths
+sub,subtitles,/tmp/subs is specified, MPlayer searches for subtitle files in
+these directories:
+.RSs
+/path/\:to/\:movie/
+.br
+/path/\:to/\:movie/\:sub/
+.br
+/path/\:to/\:movie/\:subtitles/
+.br
+/tmp/\:subs/
+.br
+~/.mplayer/\:sub/
+.RE
+.PD 1
+.
+.TP
 .B \-subdelay <sec>
 Delays subtitles by <sec> seconds.
 Can be negative.
@@ -11741,14 +11762,6 @@ font directory (There must be a font.des
 .TP
 ~/.mplayer/\:DVDkeys/
 cached CSS keys
-.
-.TP
-Assuming that /path/\:to/\:movie.avi is played, MPlayer searches for sub files
-in this order:
-.RS
-/path/\:to/\:movie.sub
-.br
-~/.mplayer/\:sub/\:movie.sub
 .RE
 .PD 1
 .