Remove unneeded VOUT_CLOSE.
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 14 Feb 2009 18:26:42 +0000 (20:26 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sat, 14 Feb 2009 18:26:42 +0000 (20:26 +0200)
include/vlc_vout.h
modules/gui/macosx/voutgl.m
modules/gui/minimal_macosx/VLCOpenGLVoutView.m
modules/video_output/msw/events.c
modules/video_output/omapfb.c
modules/video_output/x11/xcommon.c

index 2effe42..f0593ba 100644 (file)
@@ -705,7 +705,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_CLOSE,
     VOUT_SET_FOCUS,         /* arg1= bool       res=    */
     VOUT_SET_VIEWPORT,      /* arg1= view rect, arg2=clip rect, res= */
     VOUT_REDRAW_RECT,       /* arg1= area rect, res= */
index ec804ad..d5a492c 100644 (file)
@@ -275,7 +275,6 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
             [p_vout->p_sys->o_vout_view setOnTop: b_arg];
             return VLC_SUCCESS;
 
-        case VOUT_CLOSE:
         case VOUT_REPARENT:
         default:
             return vout_vaControlDefault( p_vout, i_query, args );
index 31e53d0..a4fa96d 100644 (file)
@@ -151,7 +151,6 @@ int cocoaglvoutviewControl( vout_thread_t *p_vout, int i_query, va_list args )
             [[p_vout->p_sys->o_glview container] setOnTop: b_arg];
             return VLC_SUCCESS;
 
-        case VOUT_CLOSE:
         case VOUT_REPARENT:
         default:
             return vout_vaControlDefault( p_vout, i_query, args );
index 119680c..7ac260d 100644 (file)
@@ -1075,8 +1075,6 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
 
         return VLC_SUCCESS;
 
-    case VOUT_CLOSE:
-        ShowWindow( p_vout->p_sys->hwnd, SW_HIDE );
     case VOUT_REPARENT:
         /* Retrieve the window position */
         point.x = point.y = 0;
@@ -1094,8 +1092,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
             p_vout->p_sys->i_window_style =
                 WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW | WS_SIZEBOX;
             SetWindowLong( p_vout->p_sys->hwnd, GWL_STYLE,
-                           p_vout->p_sys->i_window_style |
-                           (i_query == VOUT_CLOSE ? 0 : WS_VISIBLE) );
+                           p_vout->p_sys->i_window_style | WS_VISIBLE);
             SetWindowLong( p_vout->p_sys->hwnd, GWL_EXSTYLE, WS_EX_APPWINDOW );
             SetWindowPos( p_vout->p_sys->hwnd, 0, point.x, point.y, 0, 0,
                           SWP_NOSIZE|SWP_NOZORDER|SWP_FRAMECHANGED );
@@ -1109,8 +1106,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
             SetParent( p_vout->p_sys->hwnd, d );
             p_vout->p_sys->i_window_style = WS_CLIPCHILDREN;
             SetWindowLong( p_vout->p_sys->hwnd, GWL_STYLE,
-                           p_vout->p_sys->i_window_style |
-                           (i_query == VOUT_CLOSE ? 0 : WS_VISIBLE) );
+                           p_vout->p_sys->i_window_style | WS_VISIBLE);
             SetWindowLong( p_vout->p_sys->hwnd, GWL_EXSTYLE, WS_EX_APPWINDOW );
 
             /* Retrieve the parent size */
index 9d6d27f..2daaee9 100644 (file)
@@ -376,7 +376,6 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
     switch( i_query )
     {
        case VOUT_REPARENT:
-       case VOUT_CLOSE:
             vout_ReleaseWindow( p_vout->p_sys->owner_window );
             return VLC_SUCCESS;
        default:
index 7b6d6d6..15655a8 100644 (file)
@@ -3183,13 +3183,6 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
             vlc_mutex_unlock( &p_vout->p_sys->lock );
             return VLC_SUCCESS;
 
-       case VOUT_CLOSE:
-            vlc_mutex_lock( &p_vout->p_sys->lock );
-            XUnmapWindow( p_vout->p_sys->p_display,
-                          p_vout->p_sys->original_window.base_window );
-            vlc_mutex_unlock( &p_vout->p_sys->lock );
-            /* Fall through */
-
        case VOUT_REPARENT:
             vlc_mutex_lock( &p_vout->p_sys->lock );
             if( i_query == VOUT_REPARENT ) d = (Drawable)va_arg( args, int );