Renamed spu_DisplaySubpicture into spu_PutSubpicture.

LegendGC · Jan 9, 2011 · 96b2317 · 96b2317
1 parent 8e47c59
commit 96b2317
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/include/vlc_spu.h b/include/vlc_spu.h
@@ -68,7 +68,7 @@ VLC_EXPORT( void, spu_Destroy, ( spu_t * ) );
  * 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_EXPORT( void, spu_PutSubpicture, ( spu_t *, subpicture_t * ) );
 
 /**
  * This function will return an unique subpicture containing the OSD and

diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
@@ -141,7 +141,7 @@ int transcode_spu_process( sout_stream_t *p_stream,
 
     if( p_sys->b_soverlay )
     {
-        spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
+        spu_PutSubpicture( p_sys->p_spu, p_subpic );
     }
     else
     {

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
@@ -401,7 +401,7 @@ sout_StreamChainNew
 sout_UpdateStatistic
 spu_Create
 spu_Destroy
-spu_DisplaySubpicture
+spu_PutSubpicture
 spu_ChangeFilters
 spu_Render
 spu_RegisterChannel

diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
@@ -302,7 +302,7 @@ void filter_chain_SubFilter( filter_chain_t *p_chain,
         subpicture_t *p_subpic = p_filter->pf_sub_filter( p_filter, display_date );
         /* XXX I find that spu_t cast ugly */
         if( p_subpic )
-            spu_DisplaySubpicture( (spu_t*)p_chain->p_this, p_subpic );
+            spu_PutSubpicture( (spu_t*)p_chain->p_this, p_subpic );
     }
 }
 

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
@@ -106,7 +106,7 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
     p_spu->p_region->i_x = i_hmargin;
     p_spu->p_region->i_y = i_vmargin;
 
-    spu_DisplaySubpicture( p_spu_channel, p_spu );
+    spu_PutSubpicture( p_spu_channel, p_spu );
 
     return VLC_SUCCESS;
 }

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
@@ -1082,7 +1082,7 @@ static void ThreadManage(vout_thread_t *vout,
 static void ThreadDisplaySubpicture(vout_thread_t *vout,
                                     subpicture_t *subpicture)
 {
-    spu_DisplaySubpicture(vout->p->spu, subpicture);
+    spu_PutSubpicture(vout->p->spu, subpicture);
 }
 
 static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
@@ -316,7 +316,7 @@ int spu_ProcessMouse( spu_t *p_spu,
  * \param p_spu the subpicture unit object
  * \param p_subpic the subpicture to display
  */
-void spu_DisplaySubpicture( spu_t *p_spu, subpicture_t *p_subpic )
+void spu_PutSubpicture( spu_t *p_spu, subpicture_t *p_subpic )
 {
     spu_private_t *p_sys = p_spu->p;
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,7 @@ int transcode_spu_process( sout_stream_t *p_stream, @@
         if( p_sys->b_soverlay )
         {
-            spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
+            spu_PutSubpicture( p_sys->p_spu, p_subpic );
         }
         else
         {
@@ Expand Down @@