diff options
Diffstat (limited to 'player')
-rw-r--r-- | player/command.c | 15 | ||||
-rw-r--r-- | player/playloop.c | 11 |
2 files changed, 2 insertions, 24 deletions
diff --git a/player/command.c b/player/command.c index 81b1bb810c..21d62f965c 100644 --- a/player/command.c +++ b/player/command.c @@ -6117,19 +6117,8 @@ void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags, } } - if (mpctx->video_out) { - if (opt_ptr == &opts->vo->fullscreen) { - vo_control(mpctx->video_out, VOCTRL_FULLSCREEN, 0); - if (!opts->vo->fullscreen) - mpctx->mouse_event_ts--; // Show mouse cursor - } - if (opt_ptr == &opts->vo->ontop) - vo_control(mpctx->video_out, VOCTRL_ONTOP, 0); - if (opt_ptr == &opts->vo->border) - vo_control(mpctx->video_out, VOCTRL_BORDER, 0); - if (opt_ptr == &opts->vo->all_workspaces) - vo_control(mpctx->video_out, VOCTRL_ALL_WORKSPACES, 0); - } + if (opt_ptr == &opts->vo->fullscreen && !opts->vo->fullscreen) + mpctx->mouse_event_ts--; // Show mouse cursor if (opt_ptr == &opts->vo->taskbar_progress) update_vo_playback_state(mpctx); diff --git a/player/playloop.c b/player/playloop.c index e671d35ecd..3049763661 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -845,17 +845,6 @@ static void handle_vo_events(struct MPContext *mpctx) mp_notify(mpctx, MP_EVENT_WIN_RESIZE, NULL); if (events & VO_EVENT_WIN_STATE) mp_notify(mpctx, MP_EVENT_WIN_STATE, NULL); - if (events & VO_EVENT_FULLSCREEN_STATE) { - // The only purpose of this is to update the fullscreen flag on the - // playloop side if it changes "from outside" on the VO. - int old_fs = mpctx->opts->vo->fullscreen; - int fs = old_fs; - vo_control(vo, VOCTRL_GET_FULLSCREEN, &fs); - if (old_fs != fs) { - m_config_set_option_raw(mpctx->mconfig, - m_config_get_co(mpctx->mconfig, bstr0("fullscreen")), &fs, 0); - } - } } static void handle_sstep(struct MPContext *mpctx) |