Calls directly the vout wrapper iof using function pointers.

[vlc] / include / vlc_vout.h

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 1eb7bfb8a60ebddcc07fcb25aac0a57649aa5961..fdae82a81ca5d46ac9ddea5a9f62ca29afde14e2 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -130,19 +130,6 @@ struct vout_thread_t
 
     /**@}*/
 
-    /** \name Plugin used and shortcuts to access its capabilities */
-    /**@{*/
-    int       ( *pf_init )       ( vout_thread_t * );
-    void      ( *pf_end )        ( vout_thread_t * );
-    int       ( *pf_manage )     ( vout_thread_t * );
-    void      ( *pf_render )     ( vout_thread_t *, picture_t * );
-    void      ( *pf_display )    ( vout_thread_t *, picture_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 */
     /**@{*/
     int                 i_heap_size;                          /**< heap size */
@@ -318,34 +305,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 */