summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-14 00:24:41 +0200
committerwm4 <wm4@nowhere>2013-06-14 00:37:39 +0200
commitf1d3ba0e3318eb4b0ac5686fed4b80acb3753919 (patch)
treeb433072a2e2fc7ff04d4e413bdea94bada3a335c /DOCS/man
parent648c3d790a2e5123fdea0f02743058b59e85dd94 (diff)
downloadmpv-f1d3ba0e3318eb4b0ac5686fed4b80acb3753919.tar.bz2
mpv-f1d3ba0e3318eb4b0ac5686fed4b80acb3753919.tar.xz
x11: enable screensaver when paused, rename/change --stop-xscreensaver
Use the recently introduced screensaver VOCTRLs to control the screensaver in the X11 backend. This means the behavior when paused changes: the old code always kept the screensaver disabled, but now the screensaver is reenabled on pausing. Rename the --stop-xscreensaver option to --stop-screensaver and make it more generic. Now it affects all backends that respond to the screensaver VOCTRLs.
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/en/changes.rst1
-rw-r--r--DOCS/man/en/options.rst14
2 files changed, 9 insertions, 6 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 49d27c9415..de3b24b710 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -127,6 +127,7 @@ Command line switches
-a52drc level --ad-lavc-ac3drc=level
-dumpstream --stream-dump=<filename>
-capture --stream-capture=<filename>
+ -stop-xscreensaver --stop-screensaver
=================================== ===================================
*NOTE*: ``-opt val`` becomes ``--opt=val``.
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 61dbf7bd98..f8a999758e 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -781,7 +781,7 @@
``-vo=null``).
This can be "misused" to disable screensavers that do not support the
- proper X API (see also ``--stop-xscreensaver``). If you think this is too
+ proper X API (see also ``--stop-screensaver``). If you think this is too
complicated, ask the author of the screensaver program to support the
proper X APIs.
@@ -1973,11 +1973,13 @@
*NOTE*: without ``--hr-seek``, skipping will snap to keyframes.
---stop-xscreensaver
- (X11 only)
- Turns off xscreensaver at startup and turns it on again on exit. If your
- screensaver supports neither the XSS nor XResetScreenSaver API please use
- ``--heartbeat-cmd`` instead.
+--stop-screensaver, --no-stop-screensaver
+ Turns off the screensaver (or screen blanker and similar mechanisms) at
+ startup and turns it on again on exit. (Default: yes)
+
+ This is not supported on all video outputs or platforms. Sometimes it is
+ implemented, but doesn't work (happens often on GNOME). You might be able
+ to to work this around using ``--heartbeat-cmd`` instead.
--sub=<subtitlefile1,subtitlefile2,...>
Use/display these subtitle files. Only one file can be displayed at the