Commit 96b23172 authored by Laurent Aimar's avatar Laurent Aimar

Renamed spu_DisplaySubpicture into spu_PutSubpicture.

parent 8e47c597
...@@ -68,7 +68,7 @@ VLC_EXPORT( void, spu_Destroy, ( spu_t * ) ); ...@@ -68,7 +68,7 @@ VLC_EXPORT( void, spu_Destroy, ( spu_t * ) );
* You cannot use the provided subpicture anymore. The spu_t core * You cannot use the provided subpicture anymore. The spu_t core
* will destroy it at its convenience. * 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 * This function will return an unique subpicture containing the OSD and
......
...@@ -141,7 +141,7 @@ int transcode_spu_process( sout_stream_t *p_stream, ...@@ -141,7 +141,7 @@ int transcode_spu_process( sout_stream_t *p_stream,
if( p_sys->b_soverlay ) if( p_sys->b_soverlay )
{ {
spu_DisplaySubpicture( p_sys->p_spu, p_subpic ); spu_PutSubpicture( p_sys->p_spu, p_subpic );
} }
else else
{ {
......
...@@ -401,7 +401,7 @@ sout_StreamChainNew ...@@ -401,7 +401,7 @@ sout_StreamChainNew
sout_UpdateStatistic sout_UpdateStatistic
spu_Create spu_Create
spu_Destroy spu_Destroy
spu_DisplaySubpicture spu_PutSubpicture
spu_ChangeFilters spu_ChangeFilters
spu_Render spu_Render
spu_RegisterChannel spu_RegisterChannel
......
...@@ -302,7 +302,7 @@ void filter_chain_SubFilter( filter_chain_t *p_chain, ...@@ -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 ); subpicture_t *p_subpic = p_filter->pf_sub_filter( p_filter, display_date );
/* XXX I find that spu_t cast ugly */ /* XXX I find that spu_t cast ugly */
if( p_subpic ) if( p_subpic )
spu_DisplaySubpicture( (spu_t*)p_chain->p_this, p_subpic ); spu_PutSubpicture( (spu_t*)p_chain->p_this, p_subpic );
} }
} }
......
...@@ -106,7 +106,7 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel, ...@@ -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_x = i_hmargin;
p_spu->p_region->i_y = i_vmargin; 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; return VLC_SUCCESS;
} }
......
...@@ -1082,7 +1082,7 @@ static void ThreadManage(vout_thread_t *vout, ...@@ -1082,7 +1082,7 @@ static void ThreadManage(vout_thread_t *vout,
static void ThreadDisplaySubpicture(vout_thread_t *vout, static void ThreadDisplaySubpicture(vout_thread_t *vout,
subpicture_t *subpicture) subpicture_t *subpicture)
{ {
spu_DisplaySubpicture(vout->p->spu, subpicture); spu_PutSubpicture(vout->p->spu, subpicture);
} }
static void ThreadFlushSubpicture(vout_thread_t *vout, int channel) static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
......
...@@ -316,7 +316,7 @@ int spu_ProcessMouse( spu_t *p_spu, ...@@ -316,7 +316,7 @@ int spu_ProcessMouse( spu_t *p_spu,
* \param p_spu the subpicture unit object * \param p_spu the subpicture unit object
* \param p_subpic the subpicture to display * \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; spu_private_t *p_sys = p_spu->p;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment