Commit ee7537e7 authored by Rémi Duraffort's avatar Rémi Duraffort

Use pl_Locked and pl_Unlocked.

parent bd8145b4
......@@ -961,7 +961,7 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
if( b_play )
{
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
p_playlist->status.p_item, NULL );
}
......
......@@ -925,7 +925,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num )
if( !strcmp( psz_bookmark, psz_uri ) )
{
free( psz_uri );
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
NULL, p_item );
break;
}
......
......@@ -1417,7 +1417,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1];
while( p_parent->p_parent )
p_parent = p_parent->p_parent;
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
p_parent, p_item );
}
else
......
......@@ -711,7 +711,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
while( p_parent->p_parent )
p_parent = p_parent->p_parent;
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
false, p_parent, p_item );
pl_Unlocked, p_parent, p_item );
}
else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
== 0 )
......@@ -722,7 +722,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
else
{
p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL );
}
b_box_plidx_follow = true;
......
......@@ -276,7 +276,7 @@ void PLModel::activateItem( playlist_item_t *p_item )
p_parent = p_parent->p_parent;
}
if( p_parent )
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
p_parent, p_item );
}
......
......@@ -112,7 +112,7 @@ void Playtree::action( VarTree *pItem )
if( p_parent )
{
playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, true, p_parent, p_item );
playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item );
}
vlc_object_unlock( m_pPlaylist );
}
......
......@@ -91,7 +91,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
RAISEVOID( "Unable to find item" );
}
playlist_Control( PL, PLAYLIST_VIEWPLAY, true,
playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
PL->status.p_node, p_item );
if( did_lock == 1 )
{
......
......@@ -99,7 +99,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
if( i_ret == VLC_SUCCESS && b_play )
{
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
true, p_item_in_category, NULL );
pl_Locked, p_item_in_category, NULL );
}
}
......
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