X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vout.h;h=30baf2517827185f3b73f55ae10d33f482ed1e96;hb=f98d6a45b17127f51bda0591af1f3dafe6b1cf44;hp=6ac217e653bb624c95c1ca1776376ccfb8b8c272;hpb=23cc599d06abb5c84913c7399dd08c6b283fc49e;p=vlc diff --git a/include/vlc_vout.h b/include/vlc_vout.h index 6ac217e653..30baf25178 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -86,7 +86,7 @@ struct picture_t * These properties can be modified using the video output thread API, * but should never be written directly */ /**@{*/ - int i_refcount; /**< link reference counter */ + unsigned i_refcount; /**< link reference counter */ mtime_t date; /**< display date */ vlc_bool_t b_force; /**@}*/ @@ -284,6 +284,10 @@ struct subpicture_t video_format_t *, picture_t * ); void ( *pf_destroy_region ) ( vlc_object_t *, subpicture_region_t * ); + void ( *pf_pre_render ) ( video_format_t *, spu_t *, subpicture_t *, mtime_t ); + subpicture_region_t * ( *pf_update_regions ) ( video_format_t *, spu_t *, + subpicture_t *, mtime_t ); + /** Private data - the subtitle plugin might want to put stuff here to * keep track of the subpicture */ subpicture_sys_t *p_sys; /* subpicture data */ @@ -309,6 +313,9 @@ struct subpicture_t #define SUBPICTURE_ALIGN_MASK ( SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_RIGHT| \ SUBPICTURE_ALIGN_TOP |SUBPICTURE_ALIGN_BOTTOM ) +/* Subpicture rendered flag - should only be used by vout_subpictures */ +#define SUBPICTURE_RENDERED 0x10 + /***************************************************************************** * Prototypes *****************************************************************************/