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 /player | |
| 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 'player')
| -rw-r--r-- | player/command.c | 2 | ||||
| -rw-r--r-- | player/playloop.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/player/command.c b/player/command.c index c12ad007d1..26438c06f6 100644 --- a/player/command.c +++ b/player/command.c @@ -6214,7 +6214,7 @@ void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags, if (opt_ptr == &opts->vo->window_scale) update_window_scale(mpctx); - if (opt_ptr == &opts->vo->cursor_autohide_delay) + if (opt_ptr == &opts->cursor_autohide_delay) mpctx->mouse_timer = 0; if (flags & UPDATE_DVB_PROG) { diff --git a/player/playloop.c b/player/playloop.c index 8a287bfadf..8fa590ff68 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -815,7 +815,7 @@ static void handle_cursor_autohide(struct MPContext *mpctx) unsigned mouse_event_ts = mp_input_get_mouse_event_counter(mpctx->input); if (mpctx->mouse_event_ts != mouse_event_ts) { mpctx->mouse_event_ts = mouse_event_ts; - mpctx->mouse_timer = now + vo->opts->cursor_autohide_delay / 1000.0; + mpctx->mouse_timer = now + opts->cursor_autohide_delay / 1000.0; mouse_cursor_visible = true; } @@ -825,13 +825,13 @@ static void handle_cursor_autohide(struct MPContext *mpctx) mouse_cursor_visible = false; } - if (vo->opts->cursor_autohide_delay == -1) + if (opts->cursor_autohide_delay == -1) mouse_cursor_visible = true; - if (vo->opts->cursor_autohide_delay == -2) + if (opts->cursor_autohide_delay == -2) mouse_cursor_visible = false; - if (vo->opts->cursor_autohide_fs && !opts->vo->fullscreen) + if (opts->cursor_autohide_fs && !opts->vo->fullscreen) mouse_cursor_visible = true; if (mouse_cursor_visible != mpctx->mouse_cursor_visible) |