Commit 3d1fee81 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

audioscrobbler: no need to lock playlist to add callbacks

We already have the variables lock for that.
parent 99f3ffac
...@@ -177,7 +177,6 @@ vlc_module_end () ...@@ -177,7 +177,6 @@ vlc_module_end ()
*****************************************************************************/ *****************************************************************************/
static int Open( vlc_object_t *p_this ) static int Open( vlc_object_t *p_this )
{ {
playlist_t *p_playlist;
intf_thread_t *p_intf = ( intf_thread_t* ) p_this; intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
intf_sys_t *p_sys = calloc( 1, sizeof( intf_sys_t ) ); intf_sys_t *p_sys = calloc( 1, sizeof( intf_sys_t ) );
...@@ -189,10 +188,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -189,10 +188,7 @@ static int Open( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->lock ); vlc_mutex_init( &p_sys->lock );
vlc_cond_init( &p_sys->wait ); vlc_cond_init( &p_sys->wait );
p_playlist = pl_Get( p_intf ); var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
PL_LOCK;
var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
PL_UNLOCK;
p_intf->pf_run = Run; p_intf->pf_run = Run;
...@@ -204,12 +200,11 @@ static int Open( vlc_object_t *p_this ) ...@@ -204,12 +200,11 @@ static int Open( vlc_object_t *p_this )
*****************************************************************************/ *****************************************************************************/
static void Close( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this )
{ {
playlist_t *p_playlist; playlist_t *p_playlist = pl_Get( p_this );
input_thread_t *p_input; input_thread_t *p_input;
intf_thread_t *p_intf = ( intf_thread_t* ) p_this; intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
p_playlist = pl_Get( p_intf );
var_DelCallback( p_playlist, "item-current", ItemChange, p_intf ); var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
p_input = playlist_CurrentInput( p_playlist ); p_input = playlist_CurrentInput( 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