static void Run( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
p_sys->p_playlist = p_playlist;
int i_key;
var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
- while( !intf_ShouldDie( p_intf ) )
+ while( vlc_object_alive( p_intf ) )
{
msleep( INTF_IDLE_SLEEP );
{
if( !p_sys->p_input->b_dead )
{
- vlc_object_yield( p_sys->p_input );
+ vlc_object_hold( p_sys->p_input );
}
}
}
return 0; \
} while(0)
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if( p_sys->i_box_type == BOX_PLAYLIST )
{
static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level )
{
if( p_obj->psz_object_name )
- MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%d)",
+ MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)",
p_obj->psz_object_type, p_obj->psz_object_name,
- p_obj->i_object_id );
+ p_obj );
else
- MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%d)",
- p_obj->psz_object_type, p_obj->i_object_id );
+ MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)",
+ p_obj->psz_object_type, p_obj );
vlc_list_t *list = vlc_list_children( p_obj );
for( int i = 0; i < list->i_count ; i++ )
{
intf_sys_t *p_sys = p_intf->p_sys;
input_thread_t *p_input = p_sys->p_input;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
int y = 0;
int h;
int y_end;
static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
playlist_item_t *p_item;
switch( p_sys->i_current_view )
static void PlaylistRebuild( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
PL_LOCK;
VLC_UNUSED(p_this); VLC_UNUSED(psz_variable);
VLC_UNUSED(oval); VLC_UNUSED(nval);
intf_thread_t *p_intf = (intf_thread_t *)param;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
p_intf->p_sys->b_need_update = true;
p_intf->p_sys->p_node = p_playlist->status.p_node;
vlc_object_release( p_playlist );
static inline bool PlaylistIsPlaying( intf_thread_t *p_intf,
playlist_item_t *p_item )
{
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
playlist_item_t *p_played_item = p_playlist->status.p_item;
vlc_object_release( p_playlist );
return( p_item != NULL && p_played_item != NULL &&
* If it's neither of these, then return
*/
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
PL_LOCK;
if( p_playlist->status.p_item == NULL )
static void PlayPause( intf_thread_t *p_intf )
{
input_thread_t *p_input = p_intf->p_sys->p_input;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
vlc_value_t val;
if( p_input )