From dd4e022cb3230462ef5f46a1e7e8e00789b621a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 14 Feb 2009 22:19:13 +0200 Subject: [PATCH] Remove useless vout_vaControlDefault --- include/vlc_vout.h | 1 - modules/gui/beos/VideoOutput.cpp | 2 +- modules/gui/macosx/voutgl.m | 5 ++--- modules/gui/minimal_macosx/VLCOpenGLVoutView.m | 3 +-- modules/gui/minimal_macosx/voutagl.m | 2 +- modules/misc/dummy/vout.c | 7 ++----- modules/misc/stats/vout.c | 7 ++----- modules/video_output/fb.c | 7 ++----- modules/video_output/msw/events.c | 2 +- modules/video_output/omapfb.c | 2 +- modules/video_output/opengl.c | 11 +++-------- modules/video_output/opengllayer.m | 11 +++-------- modules/video_output/x11/xcommon.c | 2 +- src/libvlccore.sym | 1 - src/video_output/vout_intf.c | 14 -------------- 15 files changed, 20 insertions(+), 57 deletions(-) diff --git a/include/vlc_vout.h b/include/vlc_vout.h index f0593bae7b..0f716094ce 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -674,7 +674,6 @@ VLC_EXPORT( void, vout_LinkPicture, ( vout_thread_t *, picture_t * VLC_EXPORT( void, vout_UnlinkPicture, ( vout_thread_t *, picture_t * ) ); VLC_EXPORT( void, vout_PlacePicture, ( const vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int * ) ); -VLC_EXPORT( int, vout_vaControlDefault, ( vout_thread_t *, int, va_list ) ); void vout_IntfInit( vout_thread_t * ); VLC_EXPORT( void, vout_EnableFilter, ( vout_thread_t *, char *,bool , bool ) ); diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp index 181b3b29c7..cb1805bebc 100644 --- a/modules/gui/beos/VideoOutput.cpp +++ b/modules/gui/beos/VideoOutput.cpp @@ -1367,7 +1367,7 @@ void Display( vout_thread_t *p_vout, picture_t *p_pic ) static int Control( vout_thread_t * p_vout, int i_query, va_list args ) { - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } /* following functions are local */ diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index d5a492c1da..47dac9ee35 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -275,9 +275,8 @@ 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_REPARENT: default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } @@ -792,7 +791,7 @@ static int aglControl( vout_thread_t *p_vout, int i_query, va_list args ) } default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } diff --git a/modules/gui/minimal_macosx/VLCOpenGLVoutView.m b/modules/gui/minimal_macosx/VLCOpenGLVoutView.m index a4fa96d1ac..62fea6fef3 100644 --- a/modules/gui/minimal_macosx/VLCOpenGLVoutView.m +++ b/modules/gui/minimal_macosx/VLCOpenGLVoutView.m @@ -151,9 +151,8 @@ 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_REPARENT: default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } diff --git a/modules/gui/minimal_macosx/voutagl.m b/modules/gui/minimal_macosx/voutagl.m index 92f9f6f356..68c20e9556 100644 --- a/modules/gui/minimal_macosx/voutagl.m +++ b/modules/gui/minimal_macosx/voutagl.m @@ -379,7 +379,7 @@ int aglControl( vout_thread_t *p_vout, int i_query, va_list args ) } default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } diff --git a/modules/misc/dummy/vout.c b/modules/misc/dummy/vout.c index 78147b15d8..0b4cdbb481 100644 --- a/modules/misc/dummy/vout.c +++ b/modules/misc/dummy/vout.c @@ -73,11 +73,8 @@ int OpenVideo ( vlc_object_t *p_this ) *****************************************************************************/ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { - switch( i_query ) - { - default: - return vout_vaControlDefault( p_vout, i_query, args ); - } + (void) p_vout; (void) i_query; (void) args; + return VLC_EGENERIC; } diff --git a/modules/misc/stats/vout.c b/modules/misc/stats/vout.c index 5fb4bd8e0c..a765e3dd8a 100644 --- a/modules/misc/stats/vout.c +++ b/modules/misc/stats/vout.c @@ -73,11 +73,8 @@ int OpenVideo ( vlc_object_t *p_this ) *****************************************************************************/ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { - switch( i_query ) - { - default: - return vout_vaControlDefault( p_vout, i_query, args ); - } + (void) p_vout; (void) i_query; (void) args; + return VLC_EGENERIC; } diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index acec4c9c71..8aa5050dba 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -651,11 +651,8 @@ static void End( vout_thread_t *p_vout ) *****************************************************************************/ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { - switch( i_query ) - { - default: - return vout_vaControlDefault( p_vout, i_query, args ); - } + (void) p_vout; (void) i_query; (void) args; + return VLC_EGENERIC; } /***************************************************************************** diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c index 7ac260dc9a..85762d14be 100644 --- a/modules/video_output/msw/events.c +++ b/modules/video_output/msw/events.c @@ -1136,7 +1136,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) #endif default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c index 2daaee939a..4812b626ed 100644 --- a/modules/video_output/omapfb.c +++ b/modules/video_output/omapfb.c @@ -379,7 +379,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) vout_ReleaseWindow( p_vout->p_sys->owner_window ); return VLC_SUCCESS; default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index 2147d0c204..698defc9c0 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -626,14 +626,9 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { vout_sys_t *p_sys = p_vout->p_sys; - switch( i_query ) - { - default: - if( p_sys->p_vout->pf_control ) - return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args ); - else - return vout_vaControlDefault( p_vout, i_query, args ); - } + if( p_sys->p_vout->pf_control ) + return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args ); + return VLC_EGENERIC; } static int InitTextures( vout_thread_t *p_vout ) diff --git a/modules/video_output/opengllayer.m b/modules/video_output/opengllayer.m index 4884eef09a..4e9c185bdd 100644 --- a/modules/video_output/opengllayer.m +++ b/modules/video_output/opengllayer.m @@ -334,14 +334,9 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { vout_sys_t *p_sys = p_vout->p_sys; - switch( i_query ) - { - default: - if( p_sys->p_vout->pf_control ) - return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args ); - else - return vout_vaControlDefault( p_vout, i_query, args ); - } + if( p_sys->p_vout->pf_control ) + return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args ); + return VLC_EGENERIC; } /***************************************************************************** diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index 15655a86ea..281887f288 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -3227,7 +3227,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) return VLC_SUCCESS; default: - return vout_vaControlDefault( p_vout, i_query, args ); + return VLC_EGENERIC; } } diff --git a/src/libvlccore.sym b/src/libvlccore.sym index be15e35188..e4f9c09652 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -541,6 +541,5 @@ vout_RequestWindow vout_ShowTextAbsolute vout_ShowTextRelative vout_UnlinkPicture -vout_vaControlDefault __xml_Create xml_Delete diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 6cb8459bdc..8160e854a4 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -898,20 +898,6 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, free( psz_string ); } -/***************************************************************************** - * vout_ControlDefault: default methods for video output control. - *****************************************************************************/ -int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) -{ - (void)args; - switch( i_query ) - { - default: - msg_Dbg( p_vout, "control query not supported" ); - } - return VLC_EGENERIC; -} - /***************************************************************************** * InitWindowSize: find the initial dimensions the video window should have. ***************************************************************************** -- 2.39.5