Commit b8fc3875 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove unneeded VOUT_CLOSE.

parent 6021d023
......@@ -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= */
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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 */
......
......@@ -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:
......
......@@ -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 );
......
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