summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-07 12:14:56 +0200
committerwm4 <wm4@nowhere>2016-05-07 12:14:56 +0200
commit062493fa7ea4e3a77e2e4cb9cd03f5c038c3d254 (patch)
tree726d15325decdd2d5aaa3b662fee354d083ffabe
parent55846641eac86d55817be20eab00b8256a7e1c9a (diff)
downloadmpv-062493fa7ea4e3a77e2e4cb9cd03f5c038c3d254.tar.bz2
mpv-062493fa7ea4e3a77e2e4cb9cd03f5c038c3d254.tar.xz
x11: rename inappropriate --x11-bypass-compositor=never option
This obviously made no sense.
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--options/options.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index b3ec913dee..a12c1f2743 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2085,14 +2085,14 @@ Window
This option might be removed in the future.
-``--x11-bypass-compositor=<yes|no|fs-only|always>``
+``--x11-bypass-compositor=<yes|no|fs-only|never>``
If set to ``yes``, then ask the compositor to unredirect the mpv window
(default: ``fs-only``). This uses the ``_NET_WM_BYPASS_COMPOSITOR`` hint.
``fs-only`` asks the window manager to disable the compositor only in
fullscreen mode,
- ``always`` asks the window manager to always enable the compositor.
+ ``never`` asks the window manager to never disable the compositor.
Disc Devices
diff --git a/options/options.c b/options/options.c
index b0d6fb7a30..43bc2dbece 100644
--- a/options/options.c
+++ b/options/options.c
@@ -461,7 +461,7 @@ const m_option_t mp_opts[] = {
OPT_CHOICE("x11-netwm", vo.x11_netwm, 0,
({"auto", 0}, {"no", -1}, {"yes", 1})),
OPT_CHOICE("x11-bypass-compositor", vo.x11_bypass_compositor, 0,
- ({"no", 0}, {"yes", 1}, {"fs-only", 2}, {"always", 3})),
+ ({"no", 0}, {"yes", 1}, {"fs-only", 2}, {"never", 3})),
#endif
#if HAVE_WIN32
OPT_STRING("vo-mmcss-profile", vo.mmcss_profile, M_OPT_FIXED),