]> git.sesse.net Git - vlc/commitdiff
Add 'vout window hwnd' support for OS/2
authorKO Myung-Hun <komh@chollian.net>
Sun, 13 Nov 2011 12:23:11 +0000 (21:23 +0900)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 15 Nov 2011 14:49:13 +0000 (16:49 +0200)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
modules/gui/qt4/qt4.cpp

index 430291d03890a0f10372d489a6da4664c8bca219..dd39a7e792ddb022a3f700ee3e6548a1c71f800a 100644 (file)
@@ -289,11 +289,11 @@ vlc_module_begin ()
 
         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 ()
 #if defined(Q_WS_X11)
         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 )
 #elif defined(Q_WS_MAC)
         set_capability( "vout window nsobject", 0 )
@@ -626,8 +626,8 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
         return VLC_EGENERIC;
     p_wnd->display.x11 = NULL;
 
-#elif defined (Q_WS_WIN)
-    p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+#elif defined (Q_WS_WIN) || defined(Q_WS_PM)
+    p_wnd->handle.hwnd = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
     if( !p_wnd->handle.hwnd )
         return VLC_EGENERIC;