Remove useless vout_vaControlDefault

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  ) );
 

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 */

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;
     }
 }
 

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;
     }
 }
 

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;
     }
 }
 

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;
 }
 
 

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;
 }
 
 

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;
 }
 
 /*****************************************************************************

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;
     }
 }
 

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;
     }
 }
 

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 );
-    }
+    return VLC_EGENERIC;
 }
 
 static int InitTextures( vout_thread_t *p_vout )

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 );
-    }
+    return VLC_EGENERIC;
 }
 
 /*****************************************************************************

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;
     }
 }
 

src/libvlccore.sym

@@ -541,6 +541,5 @@ vout_RequestWindow
 vout_ShowTextAbsolute
 vout_ShowTextRelative
 vout_UnlinkPicture
-vout_vaControlDefault
 __xml_Create
 xml_Delete

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.
  *****************************************************************************