RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_sdl: use new fullscreen change mechanism 

Like the other backends. (Looks relatively convoluted, because it only
uses the fullscreen legacy VOCTRL, none of the others.)
This commit is contained in:
wm4 2019-12-11 18:47:57 +01:00
parent c84460f61f
commit b6fa63b01e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
video/out/vo_sdl.c
View File

@ -34,6 +34,7 @@
#include "input/keycodes.h"
#include "input/input.h"
#include "common/msg.h"
#include "options/m_config.h"
#include "options/options.h"
#include "osdep/timer.h"
@ -189,6 +190,7 @@ struct priv {
double osd_pts;
Uint32 wakeup_event;
bool screensaver_enabled;
struct m_config_cache *opts_cache;
// options
int allow_sw;
@ -399,7 +401,8 @@ static inline void set_screensaver(bool enabled)
static void set_fullscreen(struct vo *vo)
{
struct priv *vc = vo->priv;
int fs = vo->opts->fullscreen;
struct mp_vo_opts *opts = vc->opts_cache->opts;
int fs = opts->fullscreen;
SDL_bool prev_screensaver_state = SDL_IsScreenSaverEnabled();
Uint32 fs_flag;
@ -812,6 +815,8 @@ static int preinit(struct vo *vo)
return -1;
}
vc->opts_cache = m_config_cache_alloc(vc, vo->global, &vo_sub_opts);
// predefine SDL defaults (SDL env vars shall override)
SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY, "1",
SDL_HINT_DEFAULT);
@ -927,9 +932,15 @@ static int control(struct vo *vo, uint32_t request, void *data)
struct priv *vc = vo->priv;
switch (request) {
case VOCTRL_FULLSCREEN:
case VOCTRL_VO_OPTS_CHANGED: {
void *opt;
while (m_config_cache_get_next_changed(vc->opts_cache, &opt)) {
struct mp_vo_opts *opts = vc->opts_cache->opts;
if (&opts->fullscreen == opt)
set_fullscreen(vo);
}
return 1;
}
case VOCTRL_REDRAW_FRAME:
draw_image(vo, NULL);
return 1;