spu: fix ugly cast in filter chain (and unexport function)

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index ff13032ceb0000b1d19e460933c8fb77bea99c8a..eb474eb2c91d0c2ac80f15dc14e8b7f6f2094915 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -400,7 +400,7 @@ VLC_API block_t * filter_chain_AudioFilter( filter_chain_t *, block_t * );
  * \param p_chain pointer to filter chain
  * \param display_date of subpictures
  */
-VLC_API void filter_chain_SubSource( filter_chain_t *, mtime_t );
+void filter_chain_SubSource( filter_chain_t *, spu_t *, mtime_t );
 
 /**
  * Apply filter chain to subpictures.

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 325c8f67ac162827e220594f3c12342a7b6aa8e3..4bc681c57d3c573c05a2163a6c841c3ff4e4c128 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -128,7 +128,6 @@ filter_chain_MouseFilter
 filter_chain_MouseEvent
 filter_chain_New
 filter_chain_Reset
-filter_chain_SubSource
 filter_chain_SubFilter
 filter_chain_VideoFilter
 filter_chain_VideoFlush

diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index 79a00fa82e2366dac02b54e26414288ca0c866b0..c9b56a07baae7aa8fe64e8952eaeabd9b0853259 100644 (file)
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -335,16 +335,15 @@ block_t *filter_chain_AudioFilter( filter_chain_t *p_chain, block_t *p_block )
     return p_block;
 }
 
-void filter_chain_SubSource( filter_chain_t *p_chain,
+void filter_chain_SubSource( filter_chain_t *p_chain, spu_t *spu,
                              mtime_t display_date )
 {
     for( chained_filter_t *f = p_chain->first; f != NULL; f = f->next )
     {
         filter_t *p_filter = &f->filter;
         subpicture_t *p_subpic = p_filter->pf_sub_source( p_filter, display_date );
-        /* XXX I find that spu_t cast ugly */
         if( p_subpic )
-            spu_PutSubpicture( (spu_t*)p_chain->p_this, p_subpic );
+            spu_PutSubpicture( spu, p_subpic );
     }
 }
 

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 11ed17dc4aadc51c9177048cc343e97e178380bb..c8651f99d0b8b974f77914a533ab5c79df494b78 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -1441,7 +1441,7 @@ subpicture_t *spu_Render(spu_t *spu,
         free(chain_update);
     }
     /* Run subpicture sources */
-    filter_chain_SubSource(sys->source_chain, render_osd_date);
+    filter_chain_SubSource(sys->source_chain, spu, render_osd_date);
     vlc_mutex_unlock(&sys->source_chain_lock);
 
     static const vlc_fourcc_t chroma_list_default_yuv[] = {