diff options
| author | dudemanguy <random342@airmail.cc> | 2020-01-11 18:32:13 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2020-01-12 01:54:41 +0000 |
| commit | 6cb3d024c85860470818d3a2a24358d006151d23 (patch) | |
| tree | d156ce2ac30eb275beecf451040af95de945e484 /options/options.c | |
| parent | 63bf362d1101a40fc8dc49bf24447d8740de42f7 (diff) | |
| download | mpv-6cb3d024c85860470818d3a2a24358d006151d23.tar.bz2 mpv-6cb3d024c85860470818d3a2a24358d006151d23.tar.xz | |
Revert "options: move cursor autohiding opts to mp_vo_opts"
This reverts commit 65a317436df05000366af2738bdbb834e95e33db.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c index 312354d988..41a307cffd 100644 --- a/options/options.c +++ b/options/options.c @@ -145,9 +145,6 @@ static const m_option_t mp_vo_opt_list[] = { ({"default", -1})), OPT_CHOICE_OR_INT("fs-screen", fsscreen_id, 0, 0, 32, ({"all", -2}, {"current", -1})), - OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0, - 0, 30000, ({"no", -1}, {"always", -2})), - OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0), OPT_FLAG("keepaspect", keepaspect, 0), OPT_FLAG("keepaspect-window", keepaspect_window, 0), OPT_FLAG("hidpi-window-scale", hidpi_window_scale, 0), @@ -179,7 +176,6 @@ const struct m_sub_options vo_sub_opts = { .screen_id = -1, .fsscreen_id = -1, .panscan = 0.0f, - .cursor_autohide_delay = 1000, .keepaspect = 1, .keepaspect_window = 1, .hidpi_window_scale = 1, @@ -594,6 +590,9 @@ static const m_option_t mp_opts[] = { OPT_CHOICE_OR_INT("video-rotate", video_rotate, UPDATE_IMGPAR, 0, 359, ({"no", -1})), + OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0, + 0, 30000, ({"no", -1}, {"always", -2})), + OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0), OPT_FLAG("stop-screensaver", stop_screensaver, UPDATE_SCREENSAVER), OPT_SUBSTRUCT("", video_equalizer, mp_csp_equalizer_conf, 0), @@ -910,6 +909,7 @@ static const struct MPOpts mp_default_opts = { .gapless_audio = -1, .wintitle = "${?media-title:${media-title}}${!media-title:No file} - mpv", .stop_screensaver = 1, + .cursor_autohide_delay = 1000, .video_osd = 1, .osd_level = 1, .osd_on_seek = 1, |