From bdf9a6321ddd69856ddfccf06678ac90c2442618 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 27 Aug 2009 11:04:52 +0000 Subject: Expand wid explanation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29555 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 3db7b6e3d1..0f23f7004d 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3281,6 +3281,9 @@ Enables VBI for the vesa, dfbmga and svga video output drivers. .B \-wid (also see \-guiwid) (X11, OpenGL and DirectX only) This tells MPlayer to attach to an existing window. Useful to embed MPlayer in a browser (e.g.\& the plugger extension). +This option fills the given window completely, thus aspect scaling, +panscan etc. are no longer handled by MPlayer but must be managed by the +application that created the window. . .TP .B \-xineramascreen <\-2\-...> -- cgit v1.2.3 From 1d09cab464b00198de6095fb6f2018aeae57059c Mon Sep 17 00:00:00 2001 From: jrash Date: Sat, 29 Aug 2009 00:04:43 +0000 Subject: sync with en/mplayer.1 r29555 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29580 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/zh_CN/mplayer.1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'DOCS/man') diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index 7e2685146a..a81e1ee77c 100644 --- a/DOCS/man/zh_CN/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 r29461 +.\" sync with en/mplayer.1 r29555 .\" Encoding: UTF-8 .\" Reminder of hard terms which need better/final solution later: .\" /capture; playtree in parent list; colorkey; retrace; desync; downmix; @@ -3072,9 +3072,11 @@ ggi 和 gl2 的都支持此功能。 启用 VBI 用于 vesa, dfbmga 和 svga 视频输出驱动。 . .TP -.B \-wid <窗口标识> (也请参见 \-guiwid) (仅用于 X11, OpenGL 和 DirectX) -告诉 MPlayer 附着于一个已有的窗口。 -把 MPlayer 嵌入浏览器(比如 plugger 扩展)时有用。 +.B \-wid <窗口标识>（另见 \-guiwid）（仅用于 X11、OpenGL 和 DirectX） +该选项让 MPlayer 绑定至一个已有的窗口上。 +适用于将 MPlayer 嵌入至浏览器中（比如扩展插件）。 +该选项将完全充填所给的窗口，从而会缩放宽高比。MPlayer 不再负责诸如全景模式之类 +的功能，而是由创建该窗口的应用程序管理。 . .TP .B \-xineramascreen <\-2\-...> -- cgit v1.2.3 From 8eaac761417661ed0939181f1d354a0bb00106fa Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 2 Sep 2009 19:44:15 +0000 Subject: Document directory-specific configuration file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29635 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 0f23f7004d..c7b879ba99 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -527,6 +527,11 @@ named 'movie.avi.conf' with the file-specific options in it and put it in You can also put the configuration file in the same directory as the file to be played, as long as you give the \-use\-filedir\-conf option (either on the command line or in your global config file). +If file-specific configuration file is found in the same directory, no file-specific +one is loaded from ~/.mplayer. +In addition the \-use\-filedir\-conf also enables directory-specific configuration files, +MPlayer tries to first load a mplayer.conf from the same directory as the file played +and then tries to load any file-specific configuration. .PP .I EXAMPLE MPLAYER CONFIGURATION FILE: .sp 1 -- cgit v1.2.3 From 39ed8ed063898aa85eaf9693d8382fcf82250404 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 3 Sep 2009 06:59:14 +0000 Subject: Improve wording for file/directory specific config file explanation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29638 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index c7b879ba99..3ae966bbec 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -527,10 +527,10 @@ named 'movie.avi.conf' with the file-specific options in it and put it in You can also put the configuration file in the same directory as the file to be played, as long as you give the \-use\-filedir\-conf option (either on the command line or in your global config file). -If file-specific configuration file is found in the same directory, no file-specific -one is loaded from ~/.mplayer. -In addition the \-use\-filedir\-conf also enables directory-specific configuration files, -MPlayer tries to first load a mplayer.conf from the same directory as the file played +If a file-specific configuration file is found in the same directory, no file-specific +configuration is loaded from ~/.mplayer. +In addition, the \-use\-filedir\-conf option enables directory-specific configuration files. +For this, MPlayer first tries to load a mplayer.conf from the same directory as the file played and then tries to load any file-specific configuration. .PP .I EXAMPLE MPLAYER CONFIGURATION FILE: -- cgit v1.2.3