[vlc-devel] commit: Remove unsafe VOUT_SET_FOCUS ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Feb 15 14:55:29 CET 2009


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Feb 15 15:54:27 2009 +0200| [62793494c79cdcdaece4fe3af497de1a851375ee] | committer: Rémi Denis-Courmont 

Remove unsafe VOUT_SET_FOCUS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62793494c79cdcdaece4fe3af497de1a851375ee
---

 include/vlc_vout.h                |    1 -
 modules/gui/wince/video.cpp       |    4 ----
 modules/video_output/msw/events.c |    9 ---------
 3 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 0f71609..4055f4c 100644
--- 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 0c93e9e..09501f2 100644
--- 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 85762d1..873321a 100644
--- 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;
     }




More information about the vlc-devel mailing list