summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-06-29 18:10:15 +0200
committerwm4 <wm4@nowhere>2016-06-29 18:10:15 +0200
commite40851ea22e9686572b6a905161106f2a66e5983 (patch)
tree5968b6aeea2037c219a3868f7571a73286e3dc97
parent9ed5dae4804512d40b050007b282eef8daff8818 (diff)
downloadmpv-e40851ea22e9686572b6a905161106f2a66e5983.tar.bz2
mpv-e40851ea22e9686572b6a905161106f2a66e5983.tar.xz
options: deprecate --heartbeat-cmd
It's useless. --heartbeat-interval is also considered deprecated, but this is not made explicit.
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/options.rst8
-rw-r--r--options/options.c3
3 files changed, 12 insertions, 1 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index f8584293d7..99f426be14 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -19,6 +19,8 @@ Interface changes
::
+ --- mpv 0.18.1 ---
+ - deprecate --heartbeat-cmd
--- mpv 0.18.0 ---
- now ab-loops are active even if one of the "ab-loop-a"/"-b" properties is
unset ("no"), in which case the start of the file is used if the A loop
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 2651aa018d..95b795d2aa 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2019,6 +2019,14 @@ Window
be the default behavior. Currently only affects X11 VOs.
``--heartbeat-cmd=<command>``
+
+ .. warning::
+
+ This option is redundant with Lua scripting. Further, it shouldn't be
+ needed for disabling screensaver anyway, since mpv will call
+ ``xdg-screensaver`` when using X11 backend. As a consequence this
+ option has been deprecated with no direct replacement.
+
Command that is executed every 30 seconds during playback via *system()* -
i.e. using the shell. The time between the commands can be customized with
the ``--heartbeat-interval`` option. The command is not run while playback
diff --git a/options/options.c b/options/options.c
index bb2ccb5220..0304d4e0c7 100644
--- a/options/options.c
+++ b/options/options.c
@@ -469,7 +469,8 @@ const m_option_t mp_opts[] = {
OPT_STRING("vo-mmcss-profile", vo.mmcss_profile, M_OPT_FIXED),
#endif
- OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0),
+ OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0,
+ .deprecation_message = "use Lua scripting instead"),
OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0),
OPT_CHOICE_OR_INT("screen", vo.screen_id, 0, 0, 32,