Commit 1a3b1a8f authored by Antoine Cellerier's avatar Antoine Cellerier

Remove last occurences of yield in the code and comments.

parent aeb8ac01
......@@ -78,7 +78,7 @@ typedef struct
ass_renderer_t *p_renderer;
video_format_t fmt;
} ass_handle_t;
static ass_handle_t *AssHandleYield( decoder_t *p_dec );
static ass_handle_t *AssHandleHold( decoder_t *p_dec );
static void AssHandleRelease( ass_handle_t * );
/* */
......@@ -98,7 +98,7 @@ struct decoder_sys_t
subpicture_t *p_spu_final;
};
static void DecSysRelease( decoder_sys_t *p_sys );
static void DecSysYield( decoder_sys_t *p_sys );
static void DecSysHold( decoder_sys_t *p_sys );
struct subpicture_sys_t
{
......@@ -140,7 +140,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
/* */
p_sys->p_ass = AssHandleYield( p_dec );
p_sys->p_ass = AssHandleHold( p_dec );
if( !p_sys->p_ass )
{
free( p_sys );
......@@ -174,7 +174,7 @@ static void Destroy( vlc_object_t *p_this )
DecSysRelease( p_dec->p_sys );
}
static void DecSysYield( decoder_sys_t *p_sys )
static void DecSysHold( decoder_sys_t *p_sys )
{
vlc_mutex_lock( &p_sys->lock );
p_sys->i_refcount++;
......@@ -290,7 +290,7 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_spu->pf_destroy = DestroySubpicture;
p_spu->p_sys->p_dec_sys = p_sys;
DecSysYield( p_sys );
DecSysHold( p_sys );
block_Release( p_block );
......@@ -630,7 +630,7 @@ static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic )
}
/* */
static ass_handle_t *AssHandleYield( decoder_t *p_dec )
static ass_handle_t *AssHandleHold( decoder_t *p_dec )
{
vlc_mutex_t *p_lock = var_AcquireMutex( "libass" );
if( !p_lock )
......
......@@ -80,7 +80,7 @@ InputManager::~InputManager()
/* Define the Input used.
Add the callbacks on input
p_input is yield once here */
p_input is held once here */
void InputManager::setInput( input_thread_t *_p_input )
{
delInput();
......
......@@ -663,7 +663,7 @@ static int Demux( demux_t *p_demux )
return VLC_EGENERIC;
}
/* This item hasn't been yield by input_GetItem
/* This item hasn't been held by input_GetItem
* don't release it */
p_parent_input = input_GetItem( p_input );
......
......@@ -652,7 +652,7 @@ void __vlc_object_release( vlc_object_t *p_this )
/* Slow path */
/* Remember that we cannot hold the spin while waiting on the mutex */
vlc_mutex_lock( &structure_lock );
/* Take the spin again. Note that another thread may have yielded the
/* Take the spin again. Note that another thread may have held the
* object in the (very short) mean time. */
vlc_spin_lock( &internals->ref_spin );
b_should_destroy = --internals->i_refcount == 0;
......
......@@ -540,7 +540,7 @@ found_shortcut:
p_tmp = p_tmp->p_next;
}
/* We can release the list, interesting modules were yielded */
/* We can release the list, interesting modules were held */
vlc_list_release( p_all );
/* Parse the linked list and use the first successful module */
......
......@@ -48,7 +48,7 @@ playlist_t *__pl_Hold( vlc_object_t *p_this )
barrier ();
pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
assert( VLC_OBJECT(pl) != p_this /* This does not make sense to yield the playlist
assert( VLC_OBJECT(pl) != p_this /* This does not make sense to hold the playlist
using pl_Hold. use vlc_object_hold in this case */ );
if (pl)
......
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