Skip to content

V
vlc
Commit 7b5dea4e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Use playlist_Lock explicitly

parent 3f107edb
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/control/playlist.c
View file @ 7b5dea4e
...@@ -75,7 +75,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id, ...@@ -75,7 +75,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
if (! playlist_was_locked( p_instance ) ) if (! playlist_was_locked( p_instance ) )
{ {
playlist_mark_locked( p_instance, 1 ); playlist_mark_locked( p_instance, 1 );
vlc_object_lock( PL ); playlist_Lock( PL );
did_lock = 1; did_lock = 1;
} }
...@@ -85,7 +85,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id, ...@@ -85,7 +85,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
{ {
if( did_lock == 1 ) if( did_lock == 1 )
{ {
vlc_object_unlock( PL ); playlist_Unlock( PL );
playlist_mark_locked( p_instance, 0 ); playlist_mark_locked( p_instance, 0 );
} }
RAISEVOID( "Unable to find item" ); RAISEVOID( "Unable to find item" );
...@@ -95,7 +95,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id, ...@@ -95,7 +95,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
PL->p_root_category, p_item ); PL->p_root_category, p_item );
if( did_lock == 1 ) if( did_lock == 1 )
{ {
vlc_object_unlock( PL ); playlist_Lock( PL );
playlist_mark_locked( p_instance, 0 ); playlist_mark_locked( p_instance, 0 );
} }
} }
...@@ -242,7 +242,7 @@ int libvlc_playlist_get_current_index ( libvlc_instance_t *p_instance, ...@@ -242,7 +242,7 @@ int libvlc_playlist_get_current_index ( libvlc_instance_t *p_instance,
void libvlc_playlist_lock( libvlc_instance_t *p_instance ) void libvlc_playlist_lock( libvlc_instance_t *p_instance )
{ {
assert( PL ); assert( PL );
vlc_object_lock( PL ); playlist_Lock( PL );
p_instance->b_playlist_locked = 1; p_instance->b_playlist_locked = 1;
} }
...@@ -250,7 +250,7 @@ void libvlc_playlist_unlock( libvlc_instance_t *p_instance ) ...@@ -250,7 +250,7 @@ void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
{ {
assert( PL ); assert( PL );
p_instance->b_playlist_locked = 0; p_instance->b_playlist_locked = 0;
vlc_object_unlock( PL ); playlist_Unlock( PL );
} }
libvlc_media_player_t * libvlc_playlist_get_media_player( libvlc_media_player_t * libvlc_playlist_get_media_player(
......
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