[MPlayer-dev-eng] [PATCH] Add -scr as alias to -xineramascreen.

[Alexander Strasser]

On 2015-07-07 21:26 +0200, Reimar Döffinger wrote:
> Requested by users to reduce typing.
> Also the xineramascreen name is quite bad
> as it is valid also on e.g. Windows and thus
> the xinerama part simply makes no sense.
> ---
>  DOCS/man/en/mplayer.1 | 8 ++++----
>  cfg-mplayer.h         | 1 +
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
> index c5d699e..dc888b9 100644
> --- a/DOCS/man/en/mplayer.1
> +++ b/DOCS/man/en/mplayer.1
> @@ -3541,8 +3541,8 @@ beyond the top border".
>  If an external window is specified using the \-wid option, then the x and
>  y coordinates are relative to the top-left corner of the window rather
>  than the screen.
> -The coordinates are relative to the screen given with \-xineramascreen for
> -the video output drivers that fully support \-xineramascreen (direct3d, gl, gl_tiled,
> +The coordinates are relative to the screen given with \-scr for
> +the video output drivers that fully support \-scr (direct3d, gl, gl_tiled,
>  vdpau, x11, xv, xvmc, corevideo).
>  .br
>  .I NOTE:
> @@ -3742,7 +3742,7 @@ panscan, etc are no longer handled by MPlayer but must be managed by the
>  application that created the window.
>  .
>  .TP
> -.B \-xineramascreen <\-2\-...>
> +.B \-scr <\-2\-...> (alias for \-xineramascreen)

  IMHO call it -screen or make another alias. The xineramascreen was a
misnomer but scr is not such a widely used abbreviation for screen.

>  In Xinerama configurations (i.e.\& a single desktop that spans across multiple
>  displays) this option tells MPlayer which screen to display the movie on.
>  A value of \-2 means fullscreen across the whole virtual display (in this case
> @@ -4129,7 +4129,7 @@ Mac OS X CoreVideo video output driver
>  .PD 0
>  .RSs
>  .IPs device_id=<number>
> -DEPRECATED, use \-xineramascreen instead.
> +DEPRECATED, use \-scr instead.
>  Choose the display device to use for fullscreen or set it to \-1 to
>  always use the same screen the video window is on (default: \-1 \- auto).
>  .IPs shared_buffer
> diff --git a/cfg-mplayer.h b/cfg-mplayer.h
> index 041361a..408881d 100644
> --- a/cfg-mplayer.h
> +++ b/cfg-mplayer.h
> @@ -201,6 +201,7 @@ const m_option_t mplayer_opts[]={
>      {"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0, 0, 1, NULL},
>  
>      {"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, -2, 32, NULL},
> +    {"scr", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, -2, 32, NULL},

  Could be better aligned too ease error checking. Normally I would
not care, but in this special case I think it is more readable and
easier to check.

>      {"brightness",&vo_gamma_brightness, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
>      {"saturation",&vo_gamma_saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
> -- 

  Otherwise LGTM. 

  Alexander
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20150708/dfefa639/attachment.sig>