Remove unsafe VOUT_SET_FOCUS

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 0f716094ce65304feca9002db9146a9036816e9a..4055f4cc6681fa0610f3a0546e4006dc0e724b80 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -704,7 +704,6 @@ enum output_query_e
     VOUT_SET_SIZE,         /* arg1= unsigned int, arg2= unsigned int, res= */
     VOUT_SET_STAY_ON_TOP,  /* arg1= bool       res=    */
     VOUT_REPARENT,
-    VOUT_SET_FOCUS,         /* arg1= bool       res=    */
     VOUT_SET_VIEWPORT,      /* arg1= view rect, arg2=clip rect, res= */
     VOUT_REDRAW_RECT,       /* arg1= area rect, res= */
 };

diff --git a/modules/gui/wince/video.cpp b/modules/gui/wince/video.cpp
index 0c93e9e042ddfa6e51aade27b632f5a17b64c6b6..09501f253ee2bcd0342089dec72976352ed1396b 100644 (file)
--- a/modules/gui/wince/video.cpp
+++ b/modules/gui/wince/video.cpp
@@ -202,13 +202,9 @@ LRESULT VideoWindow::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
     switch( msg )
     {
     case WM_KILLFOCUS:
-        if( p_vout )
-            vout_Control( p_vout, VOUT_SET_FOCUS, (bool)false );
         return TRUE;
 
     case WM_SETFOCUS:
-        if( p_vout )
-            vout_Control( p_vout, VOUT_SET_FOCUS, (bool)true );
         return TRUE;
 
     default:

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 85762d14be058db06f248f9efcfd265c7f3013f7..873321ac4731cda41c0ac5d24c2576ec4bb6dc58 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -1126,15 +1126,6 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
         p_vout->p_sys->b_on_top_change = true;
         return VLC_SUCCESS;
 
-#ifdef MODULE_NAME_IS_wingapi
-    case VOUT_SET_FOCUS:
-               b_bool = (bool) va_arg( args, int );
-        p_vout->p_sys->b_parent_focus = b_bool;
-        if( b_bool ) GXResume();
-        else if( !p_vout->p_sys->b_focus ) GXSuspend();
-        return VLC_SUCCESS;
-#endif
-
     default:
         return VLC_EGENERIC;
     }