summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-11 18:57:02 +0100
committerwm4 <wm4@nowhere>2014-01-11 18:58:07 +0100
commitad654f38036e53abbc902ffc5aae13fca61129e0 (patch)
tree333e7fbacfd21bd3a2b2d501da24b6a794d15fc2
parent905029ec0c89b638792a429263bb6033eb074570 (diff)
downloadmpv-ad654f38036e53abbc902ffc5aae13fca61129e0.tar.bz2
mpv-ad654f38036e53abbc902ffc5aae13fca61129e0.tar.xz
options: remove --screenw and --screenh
Doesn't make any sense anymore. X11 (which was mentioned in the manpage) autodetects it, and everything else ignored the option values. Since for incomprehensible reasons the backends and vo.c still need to exchange information about the screensize using the option fields, they're not removed yet.
-rw-r--r--DOCS/man/en/options.rst8
-rw-r--r--options/options.c3
-rw-r--r--video/out/x11_common.c9
3 files changed, 2 insertions, 18 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 835decf5e7..27aa56a7f0 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2027,14 +2027,6 @@ OPTIONS
``%%``
Replaced with the ``%`` character itself.
-``--screenh=<pixels>``
- Specify the screen height for video output drivers which do not know the
- screen resolution, like ``x11`` and TV-out.
-
-``--screenw=<pixels>``
- Specify the screen width for video output drivers which do not know the
- screen resolution, like ``x11`` and TV-out.
-
``--secondary-sid=<ID|auto|no>``
Select a secondary subtitle stream. This is similar to ``--sid``. If a
secondary subtitle is selected, it will be rendered as toptitle (i.e. on
diff --git a/options/options.c b/options/options.c
index ca07c3d3a1..1fa6a68cfe 100644
--- a/options/options.c
+++ b/options/options.c
@@ -473,9 +473,6 @@ const m_option_t mp_opts[] = {
OPT_STRING("volume-restore-data", mixer_restore_volume_data, 0),
OPT_FLAG("gapless-audio", gapless_audio, 0),
- // set screen dimensions (when not detectable or virtual!=visible)
- OPT_INTRANGE("screenw", vo.screenwidth, CONF_GLOBAL, 0, 4096),
- OPT_INTRANGE("screenh", vo.screenheight, CONF_GLOBAL, 0, 4096),
OPT_GEOMETRY("geometry", vo.geometry, 0),
OPT_SIZE_BOX("autofit", vo.autofit, 0),
OPT_SIZE_BOX("autofit-larger", vo.autofit_larger, 0),
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 5fa0c54d23..4498dd34dd 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -524,13 +524,8 @@ int vo_x11_init(struct vo *vo)
init_atoms(vo->x11);
- x11->ws_width = opts->screenwidth;
- x11->ws_height = opts->screenheight;
-
- if (!x11->ws_width)
- x11->ws_width = DisplayWidth(x11->display, x11->screen);
- if (!x11->ws_height)
- x11->ws_height = DisplayHeight(x11->display, x11->screen);
+ x11->ws_width = DisplayWidth(x11->display, x11->screen);
+ x11->ws_height = DisplayHeight(x11->display, x11->screen);
opts->screenwidth = x11->ws_width;
opts->screenheight = x11->ws_height;