* modules/access/dvdnav.c, src/video_output/vout_subpictures.c: Use the proper palett...

[vlc] / include / vlc_spu.h

diff --git a/include/vlc_spu.h b/include/vlc_spu.h
index dfffd86f224d279314a3fda2d6f233fd89a5d495..64d1d266011fc592c32744bc3bedf4bf156ff6e6 100644 (file)
--- a/include/vlc_spu.h
+++ b/include/vlc_spu.h
@@ -37,7 +37,7 @@ struct spu_t
     VLC_COMMON_MEMBERS
 
     vlc_mutex_t  subpicture_lock;                  /**< subpicture heap lock */
-    subpicture_t p_subpicture[VOUT_MAX_PICTURES];           /**< subpictures */
+    subpicture_t p_subpicture[VOUT_MAX_SUBPICTURES];        /**< subpictures */
     int i_channel;             /**< number of subpicture channels registered */
 
     filter_t *p_blend;                            /**< alpha blending module */
@@ -48,10 +48,14 @@ struct spu_t
     int i_crop_x, i_crop_y, i_crop_width, i_crop_height;       /**< cropping */
 
     int i_margin;                        /**< force position of a subpicture */
-    vlc_bool_t b_force_alpha;         /**< force alpha palette of subpicture */
-    uint8_t pi_alpha[4];                           /**< forced alpha palette */
+    vlc_bool_t b_force_palette;             /**< force palette of subpicture */
+    uint8_t palette[4][4];                               /**< forced palette */
 
     int ( *pf_control ) ( spu_t *, int, va_list );
+
+    /* Supciture filters */
+    filter_t *pp_filter[10];
+    int      i_filter;
 };
 
 static inline int spu_vaControl( spu_t *p_spu, int i_query, va_list args )
@@ -83,8 +87,9 @@ enum spu_query_e
  * \addtogroup subpicture
  * @{
  */
-#define spu_Init(a) __spu_Init(VLC_OBJECT(a))
-VLC_EXPORT( spu_t *, __spu_Init, ( vlc_object_t * ) );
+#define spu_Create(a) __spu_Create(VLC_OBJECT(a))
+VLC_EXPORT( spu_t *, __spu_Create, ( vlc_object_t * ) );
+VLC_EXPORT( int, spu_Init, ( spu_t * ) );
 VLC_EXPORT( void, spu_Destroy, ( spu_t * ) );
 void spu_Attach( spu_t *, vlc_object_t *, vlc_bool_t );
 
@@ -94,6 +99,8 @@ VLC_EXPORT( void, spu_DisplaySubpicture, ( spu_t *, subpicture_t * ) );
 
 #define spu_CreateRegion(a,b) __spu_CreateRegion(VLC_OBJECT(a),b)
 VLC_EXPORT( subpicture_region_t *,__spu_CreateRegion, ( vlc_object_t *, video_format_t * ) );
+#define spu_MakeRegion(a,b,c) __spu_MakeRegion(VLC_OBJECT(a),b,c)
+VLC_EXPORT( subpicture_region_t *,__spu_MakeRegion, ( vlc_object_t *, video_format_t *, picture_t * ) );
 #define spu_DestroyRegion(a,b) __spu_DestroyRegion(VLC_OBJECT(a),b)
 VLC_EXPORT( void, __spu_DestroyRegion, ( vlc_object_t *, subpicture_region_t * ) );