bool b_locked )
{
int i;
- if( !b_locked ) PL_LOCK;
+ PL_LOCK_IF( !b_locked );
ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
if( i != -1 )
{
- if( !b_locked ) PL_UNLOCK;
+ PL_UNLOCK_IF( !b_locked );
return ARRAY_VAL( p_playlist->all_items, i );
}
- if( !b_locked ) PL_UNLOCK;
+ PL_UNLOCK_IF( !b_locked );
return NULL;
}
bool b_locked )
{
int i;
- if( !b_locked ) PL_LOCK;
+ PL_LOCK_IF( !b_locked );
if( get_current_status_item( p_playlist ) &&
get_current_status_item( p_playlist )->p_input == p_item )
{
- if( !b_locked ) PL_UNLOCK;
- return get_current_status_item( p_playlist );
+ /* FIXME: this is potentially dangerous, we could destroy
+ * p_ret any time soon */
+ playlist_item_t *p_ret = get_current_status_item( p_playlist );
+ PL_UNLOCK_IF( !b_locked );
+ return p_ret;
}
/** \todo Check if this is always incremental and whether we can bsearch */
for( i = 0 ; i < p_playlist->all_items.i_size; i++ )
{
if( ARRAY_VAL(p_playlist->all_items, i)->p_input->i_id == p_item->i_id )
{
- if( !b_locked ) PL_UNLOCK;
+ PL_UNLOCK_IF( !b_locked );
return ARRAY_VAL(p_playlist->all_items, i);
}
}
- if( !b_locked ) PL_UNLOCK;
+ PL_UNLOCK_IF( !b_locked );
return NULL;
}
playlist_item_t *p_root )
{
int i;
+ PL_ASSERT_LOCKED;
assert( p_root != NULL );
for( i = 0 ; i< p_root->i_children ; i++ )
{
int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root,
const char *psz_string )
{
+ PL_ASSERT_LOCKED;
p_playlist->b_reset_currently_playing = true;
playlist_LiveSearchUpdateInternal( p_playlist, p_root, psz_string );
vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );