Commit 3cbb926a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Privatize the playlist lock

parent 7b5dea4e
......@@ -68,17 +68,17 @@ void __pl_Release( vlc_object_t *p_this )
void playlist_Lock( playlist_t *pl )
{
vlc_object_lock( pl );
vlc_mutex_lock( &pl_priv(pl)->lock );
}
void playlist_Unlock( playlist_t *pl )
{
vlc_object_unlock( pl );
vlc_mutex_unlock( &pl_priv(pl)->lock );
}
void playlist_AssertLocked( playlist_t *pl )
{
vlc_object_assert_locked( pl );
vlc_assert_locked( &pl_priv(pl)->lock );
}
int playlist_Control( playlist_t * p_playlist, int i_query,
......
......@@ -81,6 +81,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist;
VariablesInit( p_playlist );
vlc_mutex_init( &p->lock );
vlc_cond_init( &p->signal );
/* Initialise data structures */
......@@ -181,6 +182,7 @@ static void playlist_Destructor( vlc_object_t * p_this )
assert( !p_sys->p_fetcher );
vlc_cond_destroy( &p_sys->signal );
vlc_mutex_destroy( &p_sys->lock );
/* Remove all remaining items */
FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
......
......@@ -83,6 +83,7 @@ typedef struct playlist_private_t
} request;
vlc_thread_t thread; /**< engine thread */
vlc_mutex_t lock; /**< dah big playlist global lock */
vlc_cond_t signal; /**< wakes up the playlist engine thread */
int i_last_playlist_id; /**< Last id to an item */
......
......@@ -552,8 +552,7 @@ static void LoopRequest( playlist_t *p_playlist )
else
{
if( vlc_object_alive( p_playlist ) )
vlc_cond_wait( &pl_priv(p_playlist)->signal,
&vlc_internals(p_playlist)->lock );
vlc_cond_wait( &p_sys->signal, &p_sys->lock );
}
return;
}
......@@ -598,8 +597,7 @@ static void *Thread ( void *data )
/* If there is an input, check that it doesn't need to die. */
while( !LoopInput( p_playlist ) )
vlc_cond_wait( &pl_priv(p_playlist)->signal,
&vlc_internals(p_playlist)->lock );
vlc_cond_wait( &p_sys->signal, &p_sys->lock );
LoopRequest( p_playlist );
}
......
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