Remove useless vout_vaControlDefault

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index f0593bae7b4593ed6ac8d60fe7068cd86f46df0d..0f716094ce65304feca9002db9146a9036816e9a 100644 (file)
--- 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 181b3b29c76118616e1e68a657e054de063fcdf2..cb1805bebcba5f790c35b8025fb28364e822a0f6 100644 (file)
--- 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 d5a492c1da19a017fedf8a9f4cf0704133e11674..47dac9ee352f03505cb052b24cbb52baa9480924 100644 (file)
--- 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 a4fa96d1ac0020601f74c5ff523466352839a71a..62fea6fef33c5f3930403777708a7bc417de177f 100644 (file)
--- 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 92f9f6f356f446ca09c09d296290b57daa7ab531..68c20e9556b8a9a66a3ccac2a2d3df576757079e 100644 (file)
--- 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 78147b15d8e26661f50dd8c228236c1f9c3d9105..0b4cdbb481968df2e71d4a81845dd575176e7a5b 100644 (file)
--- 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 5fb4bd8e0c16603aad326d55a2dc932172126718..a765e3dd8a715929fb9e2b6b03a830e3ad054ebe 100644 (file)
--- 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 acec4c9c71969d188053ea82697d4a63e071a6f4..8aa5050dbac2a3a0fa6dc558780ba0f4a6da7a97 100644 (file)
--- 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 7ac260dc9a46423122eb79ccc2b0503188099b03..85762d14be058db06f248f9efcfd265c7f3013f7 100644 (file)
--- 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 2daaee939a37af4a46368b4862a0af4ead3b9014..4812b626ed16779ce777b21ea2d7ca2616c77a1e 100644 (file)
--- 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 2147d0c20430e95eda32a18cc66be19efe09e9bb..698defc9c08658ab791b185c3579ed3471477455 100644 (file)
--- 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 4884eef09a476b5ab3f5f045740047a5b0ec534d..4e9c185bdda47e397db51ca8b4b6dabde651f747 100644 (file)
--- 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 15655a86ea353c7c9af000bc29763eaaa3685263..281887f28824f8c8489b78c895c6cbef14a3bdb8 100644 (file)
--- 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 be15e3518888ee4a1549847eba6757a6103f095b..e4f9c0965202e206c97ef70bc85074bc2c1912ec 100644 (file)
--- 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 6cb8459bdc17a61c3a8d90f2c6b236e9044612af..8160e854a4a3674f53eb0c1b7b8ea4646a94ddfb 100644 (file)
--- 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.
  *****************************************************************************