From b8fc38757e5e9c171496c0bbf220cdb358146487 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 14 Feb 2009 20:26:42 +0200 Subject: [PATCH] Remove unneeded VOUT_CLOSE. --- include/vlc_vout.h | 1 - modules/gui/macosx/voutgl.m | 1 - modules/gui/minimal_macosx/VLCOpenGLVoutView.m | 1 - modules/video_output/msw/events.c | 8 ++------ modules/video_output/omapfb.c | 1 - modules/video_output/x11/xcommon.c | 7 ------- 6 files changed, 2 insertions(+), 17 deletions(-) diff --git a/include/vlc_vout.h b/include/vlc_vout.h index 2effe42939..f0593bae7b 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -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= */ diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index ec804ad67d..d5a492c1da 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -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 ); diff --git a/modules/gui/minimal_macosx/VLCOpenGLVoutView.m b/modules/gui/minimal_macosx/VLCOpenGLVoutView.m index 31e53d0643..a4fa96d1ac 100644 --- a/modules/gui/minimal_macosx/VLCOpenGLVoutView.m +++ b/modules/gui/minimal_macosx/VLCOpenGLVoutView.m @@ -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 ); diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c index 119680c6f7..7ac260dc9a 100644 --- a/modules/video_output/msw/events.c +++ b/modules/video_output/msw/events.c @@ -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 */ diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c index 9d6d27fbec..2daaee939a 100644 --- a/modules/video_output/omapfb.c +++ b/modules/video_output/omapfb.c @@ -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: diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index 7b6d6d6e6f..15655a86ea 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -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 ); -- 2.39.2