Commit 35e5155a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt: factor some common code

parent e0b3dcd2
...@@ -623,25 +623,19 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg ) ...@@ -623,25 +623,19 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
unsigned i_width = cfg->width; unsigned i_width = cfg->width;
unsigned i_height = cfg->height; unsigned i_height = cfg->height;
#if defined (Q_WS_X11) WId wid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); if( !wid )
if( !p_wnd->handle.xid )
return VLC_EGENERIC; return VLC_EGENERIC;
#if defined (Q_WS_X11)
p_wnd->handle.xid = wid;
p_wnd->display.x11 = NULL; p_wnd->display.x11 = NULL;
#elif defined (Q_WS_WIN) || defined (Q_WS_PM)
#elif defined (Q_WS_WIN) || defined(Q_WS_PM) p_wnd->handle.hwnd = (void *)wid;
p_wnd->handle.hwnd = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
if( !p_wnd->handle.hwnd )
return VLC_EGENERIC;
#elif defined (Q_WS_MAC) #elif defined (Q_WS_MAC)
p_wnd->handle.nsobject = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); p_wnd->handle.nsobject = (void *)wid;
if( !p_wnd->handle.nsobject )
return VLC_EGENERIC;
#else #else
# error FIXME # error FIXME
#endif #endif
p_wnd->control = WindowControl; p_wnd->control = WindowControl;
p_wnd->sys = (vout_window_sys_t*)p_mi; p_wnd->sys = (vout_window_sys_t*)p_mi;
return VLC_SUCCESS; return VLC_SUCCESS;
......
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