Commit 3ce7f98b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove VOUT_WINDOW_TYPE_NATIVE (close #7666)

parent 00dba0cc
......@@ -47,12 +47,6 @@ enum {
VOUT_WINDOW_TYPE_NSOBJECT,
};
#if defined (WIN32) || defined (__OS2__)
# define VOUT_WINDOW_TYPE_NATIVE VOUT_WINDOW_TYPE_HWND
#elif defined (__unix__)
# define VOUT_WINDOW_TYPE_NATIVE VOUT_WINDOW_TYPE_XID
#endif
/**
* Control query for vout_window_t
*/
......
......@@ -101,7 +101,25 @@ static vout_window_t *MakeWindow (vout_display_t *vd)
vout_window_cfg_t wnd_cfg;
memset (&wnd_cfg, 0, sizeof (wnd_cfg));
wnd_cfg.type = VOUT_WINDOW_TYPE_NATIVE;
/* Please keep this in sync with egl.c */
/* <EGL/eglplatform.h> defines the list and order of platforms */
#if defined(_WIN32) || defined(__VC32__) \
&& !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
wnd_cfg.type = VOUT_WINDOW_TYPE_HWND;
#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
# warning Symbian not supported.
#elif defined(WL_EGL_PLATFORM)
# error Wayland not supported.
#elif defined(__GBM__)
# error Glamor not supported.
#elif defined(ANDROID)
# error Android not supported.
#elif defined(__unix__) /* X11 */
wnd_cfg.type = VOUT_WINDOW_TYPE_XID;
#else
# error Platform not recognized.
#endif
wnd_cfg.x = var_InheritInteger (vd, "video-x");
wnd_cfg.y = var_InheritInteger (vd, "video-y");
wnd_cfg.width = vd->cfg->display.width;
......
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