Skip to content

V
vlc-2-2
Commit 66971620 authored by KO Myung-Hun's avatar KO Myung-Hun Committed by Rémi Denis-Courmont
Browse files
Options

Add 'vout window hwnd' support for OS/2 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 714ba1f1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/gui/qt4/qt4.cpp
View file @ 66971620
...@@ -289,11 +289,11 @@ vlc_module_begin () ...@@ -289,11 +289,11 @@ vlc_module_begin ()
set_callbacks( OpenDialogs, Close ) set_callbacks( OpenDialogs, Close )
#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC) #if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_PM)
add_submodule () add_submodule ()
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
set_capability( "vout window xid", 0 ) set_capability( "vout window xid", 0 )
#elif defined(Q_WS_WIN) #elif defined(Q_WS_WIN) || defined(Q_WS_PM)
set_capability( "vout window hwnd", 0 ) set_capability( "vout window hwnd", 0 )
#elif defined(Q_WS_MAC) #elif defined(Q_WS_MAC)
set_capability( "vout window nsobject", 0 ) set_capability( "vout window nsobject", 0 )
...@@ -626,8 +626,8 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg ) ...@@ -626,8 +626,8 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
return VLC_EGENERIC; return VLC_EGENERIC;
p_wnd->display.x11 = NULL; p_wnd->display.x11 = NULL;
#elif defined (Q_WS_WIN) #elif defined (Q_WS_WIN) || defined(Q_WS_PM)
p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); p_wnd->handle.hwnd = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
if( !p_wnd->handle.hwnd ) if( !p_wnd->handle.hwnd )
return VLC_EGENERIC; return VLC_EGENERIC;
......
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