X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_spu.h;h=9328cc071d804e9c826caec89911841413065d4a;hb=7abc4fee7cf2df2c306a6ac6f497e4ce2065ae9e;hp=c18329484dbffe64c4641fe6f699645c07779805;hpb=5ba9cf272657c4300008f3c33bc214840b5bc0e6;p=vlc

diff --git a/include/vlc_spu.h b/include/vlc_spu.h
index c18329484d..9328cc071d 100644
--- a/include/vlc_spu.h
+++ b/include/vlc_spu.h
@@ -46,7 +46,7 @@ extern "C" {
 typedef struct spu_private_t spu_private_t;
 
 /* Default subpicture channel ID */
-#define DEFAULT_CHAN           1
+#define SPU_DEFAULT_CHANNEL (1)
 
 /**
  * Subpicture unit descriptor
@@ -55,41 +55,12 @@ struct spu_t
 {
     VLC_COMMON_MEMBERS
 
-    int (*pf_control)( spu_t *, int, va_list );
-
     spu_private_t *p;
 };
 
-enum spu_query_e
-{
-    SPU_CHANNEL_REGISTER,         /* arg1= int *   res=    */
-    SPU_CHANNEL_CLEAR             /* arg1= int     res=    */
-};
-
-static inline int spu_vaControl( spu_t *p_spu, int i_query, va_list args )
-{
-    if( p_spu->pf_control )
-        return p_spu->pf_control( p_spu, i_query, args );
-    else
-        return VLC_EGENERIC;
-}
-
-static inline int spu_Control( spu_t *p_spu, int i_query, ... )
-{
-    va_list args;
-    int i_result;
-
-    va_start( args, i_query );
-    i_result = spu_vaControl( p_spu, i_query, args );
-    va_end( args );
-    return i_result;
-}
-
-VLC_EXPORT( spu_t *, spu_Create, ( vlc_object_t * ) );
+VLC_API spu_t * spu_Create( vlc_object_t * );
 #define spu_Create(a) spu_Create(VLC_OBJECT(a))
-VLC_EXPORT( int, spu_Init, ( spu_t * ) );
-VLC_EXPORT( void, spu_Destroy, ( spu_t * ) );
-void spu_Attach( spu_t *, vlc_object_t *, bool );
+VLC_API void spu_Destroy( spu_t * );
 
 /**
  * This function sends a subpicture to the spu_t core.
@@ -97,22 +68,39 @@ void spu_Attach( spu_t *, vlc_object_t *, bool );
  * You cannot use the provided subpicture anymore. The spu_t core
  * will destroy it at its convenience.
  */
-VLC_EXPORT( void, spu_DisplaySubpicture, ( spu_t *, subpicture_t * ) );
+VLC_API void spu_PutSubpicture( spu_t *, subpicture_t * );
 
 /**
- * This function asks the spu_t core a list of subpictures to display.
+ * This function will return an unique subpicture containing the OSD and
+ * subtitles visibles at the requested date.
+ *
+ * \param p_chroma_list is a list of supported chroma for the output (can be NULL)
+ * \param p_fmt_dst is the format of the picture on which the return subpicture will be rendered.
+ * \param p_fmt_src is the format of the original(source) video.
  *
- * The returned list can only be used by spu_RenderSubpictures.
+ * The returned value if non NULL must be released by subpicture_Delete().
  */
-VLC_EXPORT( subpicture_t *, spu_SortSubpictures, ( spu_t *, mtime_t render_subtitle_date, bool b_subtitle_only ) );
+VLC_API subpicture_t * spu_Render( spu_t *, const vlc_fourcc_t *p_chroma_list, const video_format_t *p_fmt_dst, const video_format_t *p_fmt_src, mtime_t render_subtitle_date, mtime_t render_osd_date, bool ignore_osd );
 
 /**
- * This function renders a list of subpicture_t on the provided picture.
- *
- * \param p_fmt_dst is the format of the destination picture.
- * \param p_fmt_src is the format of the original(source) video.
+ * It registers a new SPU channel.
+ */
+VLC_API int spu_RegisterChannel( spu_t * );
+
+/**
+ * It clears all subpictures associated to a SPU channel.
+ */
+VLC_API void spu_ClearChannel( spu_t *, int );
+
+/**
+ * It changes the sub sources list
+ */
+VLC_API void spu_ChangeSources( spu_t *, const char * );
+
+/**
+ * It changes the sub filters list
  */
-VLC_EXPORT( void, spu_RenderSubpictures, ( spu_t *,  picture_t *, const video_format_t *p_fmt_dst, subpicture_t *p_list, const video_format_t *p_fmt_src, mtime_t render_subtitle_date ) );
+VLC_API void spu_ChangeFilters( spu_t *, const char * );
 
 /** @}*/