diff options
author | wm4 <wm4@nowhere> | 2017-09-18 22:54:03 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-09-18 22:54:03 +0200 |
commit | 80e3173aa101ffd1c94b53299b325a0654562824 (patch) | |
tree | 1db6d8d60963d8a34b9dfec51ee5999a7a93129b /options | |
parent | 6b013133e5f6dc859d5c915d7487353169e41027 (diff) | |
download | mpv-80e3173aa101ffd1c94b53299b325a0654562824.tar.bz2 mpv-80e3173aa101ffd1c94b53299b325a0654562824.tar.xz |
options: remove --heartbeat-cmd and --heartbeat--interval
This mechanism uses system() and shouldn't even exist. x11_common.c has
its own solution for the original problem (disabling Linux DE
screensavers without MPlayer/mpv having to link a dbus lib). If that is
not sufficient, you can create a simple Lua script.
Incidentally fixes #4888.
Diffstat (limited to 'options')
-rw-r--r-- | options/options.c | 6 | ||||
-rw-r--r-- | options/options.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/options/options.c b/options/options.c index e747388088..9c435edb15 100644 --- a/options/options.c +++ b/options/options.c @@ -565,10 +565,6 @@ const m_option_t mp_opts[] = { OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0), OPT_FLAG("stop-screensaver", stop_screensaver, UPDATE_SCREENSAVER), - OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0, - .deprecation_message = "use Lua scripting instead"), - OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0), - OPT_SUBSTRUCT("", video_equalizer, mp_csp_equalizer_conf, 0), OPT_FLAG("use-filedir-conf", use_filedir_conf, 0), @@ -822,6 +818,7 @@ const m_option_t mp_opts[] = { OPT_REPLACED("sub-ass-style-override", "sub-ass-override"), OPT_REMOVED("fs-black-out-screens", NULL), OPT_REPLACED("sub-paths", "sub-file-paths"), + OPT_REMOVED("heartbeat-cmd", "use Lua scripting instead"), {0} }; @@ -841,7 +838,6 @@ const struct MPOpts mp_default_opts = { .audio_device = "auto", .audio_client_name = "mpv", .wintitle = "${?media-title:${media-title}}${!media-title:No file} - mpv", - .heartbeat_interval = 30.0, .stop_screensaver = 1, .cursor_autohide_delay = 1000, .video_osd = 1, diff --git a/options/options.h b/options/options.h index ecb38e3995..895c12182b 100644 --- a/options/options.h +++ b/options/options.h @@ -181,8 +181,6 @@ typedef struct MPOpts { char *status_msg; char *osd_status_msg; char *osd_msg[3]; - char *heartbeat_cmd; - float heartbeat_interval; int player_idle_mode; int consolecontrols; int playlist_pos; |