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

Remove useless vout_vaControlDefault

parent b8fc3875
......@@ -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 ) );
......
......@@ -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 */
......
......@@ -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;
}
}
......
......@@ -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;
}
}
......
......@@ -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;
}
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
/*****************************************************************************
......
......@@ -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;
}
}
......
......@@ -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;
}
}
......
......@@ -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 )
......
......@@ -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;
}
/*****************************************************************************
......
......@@ -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;
}
}
......
......@@ -541,6 +541,5 @@ vout_RequestWindow
vout_ShowTextAbsolute
vout_ShowTextRelative
vout_UnlinkPicture
vout_vaControlDefault
__xml_Create
xml_Delete
......@@ -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.
*****************************************************************************
......
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