Commit 53b1f060 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

window: remove useless initializers

parent 9bf41d6a
...@@ -380,6 +380,8 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg ) ...@@ -380,6 +380,8 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
CmdExecuteBlock::executeWait( CmdGenericPtr( cmd ) ); CmdExecuteBlock::executeWait( CmdGenericPtr( cmd ) );
#ifdef X11_SKINS #ifdef X11_SKINS
pWnd->display.x11 = NULL;
if( !pWnd->handle.xid ) if( !pWnd->handle.xid )
#else #else
if( !pWnd->handle.hwnd ) if( !pWnd->handle.hwnd )
......
...@@ -566,6 +566,7 @@ static int EmOpen (vout_window_t *wnd, const vout_window_cfg_t *cfg) ...@@ -566,6 +566,7 @@ static int EmOpen (vout_window_t *wnd, const vout_window_cfg_t *cfg)
p_sys->embedded = true; p_sys->embedded = true;
p_sys->keys = NULL; p_sys->keys = NULL;
wnd->display.x11 = NULL;
wnd->handle.xid = window; wnd->handle.xid = window;
wnd->control = Control; wnd->control = Control;
wnd->sys = p_sys; wnd->sys = p_sys;
......
...@@ -68,28 +68,21 @@ vout_window_t *vout_window_New(vlc_object_t *obj, ...@@ -68,28 +68,21 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
#if defined(_WIN32) || defined(__OS2__) #if defined(_WIN32) || defined(__OS2__)
case VOUT_WINDOW_TYPE_HWND: case VOUT_WINDOW_TYPE_HWND:
type = "vout window hwnd"; type = "vout window hwnd";
window->handle.hwnd = NULL;
break; break;
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
case VOUT_WINDOW_TYPE_NSOBJECT: case VOUT_WINDOW_TYPE_NSOBJECT:
type = "vout window nsobject"; type = "vout window nsobject";
window->handle.nsobject = NULL;
break; break;
#endif #endif
case VOUT_WINDOW_TYPE_XID: case VOUT_WINDOW_TYPE_XID:
type = "vout window xid"; type = "vout window xid";
window->handle.xid = 0;
window->display.x11 = NULL;
break; break;
case VOUT_WINDOW_TYPE_ANDROID_NATIVE: case VOUT_WINDOW_TYPE_ANDROID_NATIVE:
type = "vout window anative"; type = "vout window anative";
window->handle.anativewindow = NULL;
break; break;
case VOUT_WINDOW_TYPE_WAYLAND: case VOUT_WINDOW_TYPE_WAYLAND:
type = "vout surface wl"; type = "vout surface wl";
window->handle.wl = NULL;
window->display.wl = NULL;
break; break;
default: default:
assert(0); assert(0);
......
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