*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- playlist_t *p_playlist;
intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
intf_sys_t *p_sys = calloc( 1, sizeof( intf_sys_t ) );
vlc_mutex_init( &p_sys->lock );
vlc_cond_init( &p_sys->wait );
- p_playlist = pl_Hold( p_intf );
- PL_LOCK;
- var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
- PL_UNLOCK;
- pl_Release( p_intf );
+ var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
p_intf->pf_run = Run;
*****************************************************************************/
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;
intf_thread_t *p_intf = ( intf_thread_t* ) p_this;
intf_sys_t *p_sys = p_intf->p_sys;
- p_playlist = pl_Hold( p_intf );
- if( p_playlist )
- {
-
- var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
+ var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
- p_input = playlist_CurrentInput( p_playlist );
- if ( p_input )
- {
- if( p_sys->b_state_cb )
- var_DelCallback( p_input, "intf-event", PlayingChange, p_intf );
-
- vlc_object_release( p_input );
- }
-
- pl_Release( p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
+ if ( p_input )
+ {
+ if( p_sys->b_state_cb )
+ var_DelCallback( p_input, "intf-event", PlayingChange, p_intf );
+ vlc_object_release( p_input );
}
int i;
static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- playlist_t *p_playlist;
input_thread_t *p_input;
intf_thread_t *p_intf = ( intf_thread_t* ) p_data;
intf_sys_t *p_sys = p_intf->p_sys;
p_sys->b_meta_read = false;
p_sys->b_submit = false;
- p_playlist = pl_Hold( p_intf );
- p_input = playlist_CurrentInput( p_playlist );
+ p_input = playlist_CurrentInput( pl_Get( p_intf ) );
if( !p_input || p_input->b_dead )
- {
- pl_Release( p_intf );
return VLC_SUCCESS;
- }
-
- pl_Release( p_intf );
p_item = input_GetItem( p_input );
if( !p_item )
*****************************************************************************/
static int ReadMetaData( intf_thread_t *p_this )
{
- playlist_t *p_playlist;
input_thread_t *p_input;
input_item_t *p_item;
intf_sys_t *p_sys = p_this->p_sys;
- p_playlist = pl_Hold( p_this );
- p_input = playlist_CurrentInput( p_playlist );
+ p_input = playlist_CurrentInput( pl_Get( p_this ) );
if( !p_input )
- {
- pl_Release( p_this );
return( VLC_SUCCESS );
- }
-
- pl_Release( p_this );
p_item = input_GetItem( p_input );
if( !p_item )