Removed unused vout_thread_t:pf_control field and related code.

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 1eb7bfb8a60ebddcc07fcb25aac0a57649aa5961..4a60f7e703a82b93fb2c272786f39c7af74d433f 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -140,7 +140,6 @@ struct vout_thread_t
     void      ( *pf_swap )       ( vout_thread_t * );         /* OpenGL only */
     int       ( *pf_lock )       ( vout_thread_t * );         /* OpenGL only */
     void      ( *pf_unlock )     ( vout_thread_t * );         /* OpenGL only */
-    int       ( *pf_control )    ( vout_thread_t *, int, va_list );
     /**@}*/
 
     /** \name Video heap and translation tables */
@@ -318,34 +317,6 @@ VLC_EXPORT( spu_t *, vout_GetSpu, ( vout_thread_t * ) );
 void vout_IntfInit( vout_thread_t * );
 VLC_EXPORT( void, vout_EnableFilter, ( vout_thread_t *, const char *,bool , bool  ) );
 
-
-static inline int vout_vaControl( vout_thread_t *p_vout, int i_query,
-                                  va_list args )
-{
-    if( p_vout->pf_control )
-        return p_vout->pf_control( p_vout, i_query, args );
-    else
-        return VLC_EGENERIC;
-}
-
-static inline int vout_Control( vout_thread_t *p_vout, int i_query, ... )
-{
-    va_list args;
-    int i_result;
-
-    va_start( args, i_query );
-    i_result = vout_vaControl( p_vout, i_query, args );
-    va_end( args );
-    return i_result;
-}
-
-enum output_query_e
-{
-    VOUT_SET_STAY_ON_TOP=1, /* arg1= bool       res=    */
-    VOUT_SET_VIEWPORT,      /* arg1= view rect, arg2=clip rect, res= */
-    VOUT_REDRAW_RECT,       /* arg1= area rect, res= */
-};
-
 /**@}*/
 
 #endif /* _VLC_VIDEO_H */

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 34eb42bd85f7e8526f284a87e3a881209844ea02..0b2f0ddd99b32296e7d21065087bfcd17bf5a24d 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -379,7 +379,6 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     p_vout->p->b_filter_change = 0;
     p_vout->p->b_paused = false;
     p_vout->p->i_pause_date = 0;
-    p_vout->pf_control = NULL;
     p_vout->p->i_par_num =
     p_vout->p->i_par_den = 1;
     p_vout->p->p_picture_displayed = NULL;
@@ -1247,13 +1246,8 @@ static void* RunThread( void *p_this )
             break;
         }
 
-        while( p_vout->i_changes & VOUT_ON_TOP_CHANGE )
-        {
+        if( p_vout->i_changes & VOUT_ON_TOP_CHANGE )
             p_vout->i_changes &= ~VOUT_ON_TOP_CHANGE;
-            vlc_mutex_unlock( &p_vout->change_lock );
-            vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, p_vout->b_on_top );
-            vlc_mutex_lock( &p_vout->change_lock );
-        }
 
         if( p_vout->i_changes & VOUT_SIZE_CHANGE )
         {

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 1bf20f31d376e6f35375f924a8b28da945294654..6fbd45871cfed094e9a723581fd256bb75c23db9 100644 (file)
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -125,7 +125,6 @@ int vout_OpenWrapper(vout_thread_t *vout, const char *name)
     vout->pf_manage  = Manage;
     vout->pf_render  = Render;
     vout->pf_display = Display;
-    vout->pf_control = NULL;
     vout->p_sys      = sys;
 
     return VLC_SUCCESS;