Commit 9b24bfb5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

SDL: check that the vout is not windowed

If there is a window, it has to be used given the video output has non-zero
priority. Unfortunately, there are no good ways to run SDL within a window
(it can be done, but it is not thread-safe).
parent e04a1207
...@@ -116,6 +116,8 @@ static int Open(vlc_object_t *object) ...@@ -116,6 +116,8 @@ static int Open(vlc_object_t *object)
vout_display_t *vd = (vout_display_t *)object; vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys; vout_display_sys_t *sys;
if (vout_display_IsWindowed(vd))
return VLC_EGENERIC;
#if !defined(_WIN32) && !defined(__OS2__) #if !defined(_WIN32) && !defined(__OS2__)
if (!vlc_xlib_init (object)) if (!vlc_xlib_init (object))
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -191,7 +193,6 @@ static int Open(vlc_object_t *object) ...@@ -191,7 +193,6 @@ static int Open(vlc_object_t *object)
msg_Err(vd, "no video mode available"); msg_Err(vd, "no video mode available");
goto error; goto error;
} }
vout_display_DeleteWindow(vd, NULL);
sys->display = SDL_SetVideoMode(display_width, display_height, sys->display = SDL_SetVideoMode(display_width, display_height,
sys->display_bpp, sys->display_flags); sys->display_bpp, sys->display_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment