diff options
| author | wm4 <wm4@nowhere> | 2013-06-14 00:24:41 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-14 00:37:39 +0200 |
| commit | f1d3ba0e3318eb4b0ac5686fed4b80acb3753919 (patch) | |
| tree | b433072a2e2fc7ff04d4e413bdea94bada3a335c /core/options.c | |
| parent | 648c3d790a2e5123fdea0f02743058b59e85dd94 (diff) | |
| download | mpv-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 'core/options.c')
| -rw-r--r-- | core/options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/options.c b/core/options.c index 55297bf983..f73fcf7bb2 100644 --- a/core/options.c +++ b/core/options.c @@ -587,10 +587,10 @@ const m_option_t mp_opts[] = { OPT_CHOICE_OR_INT("cursor-autohide", vo.cursor_autohide_delay, 0, 0, 30000, ({"no", -1}, {"always", -2})), + OPT_FLAG("stop-screensaver", stop_screensaver, 0), OPT_INT64("wid", vo.WinID, CONF_GLOBAL), #ifdef CONFIG_X11 - OPT_FLAG("stop-xscreensaver", vo.stop_screensaver, 0), OPT_STRINGLIST("fstype", vo.fstype_list, 0), #endif OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0), @@ -743,7 +743,6 @@ const struct MPOpts mp_default_opts = { .fs = false, .screen_id = -1, .fsscreen_id = -1, - .stop_screensaver = 1, .nomouse_input = 0, .enable_mouse_movements = 1, .fsmode = 0, @@ -756,6 +755,7 @@ const struct MPOpts mp_default_opts = { }, .wintitle = "mpv - ${media-title}", .heartbeat_interval = 30.0, + .stop_screensaver = 1, .gamma_gamma = 1000, .gamma_brightness = 1000, .gamma_contrast = 1000, |