{
return( VLC_EGENERIC );
};
+ vlc_mutex_init( &p_intf->p_sys->lock );
p_intf->pf_run = RunIntf;
var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
/* Destroy structure */
+ vlc_mutex_destroy( &p_intf->p_sys->lock );
free( p_intf->p_sys );
}
/* Main loop */
while( vlc_object_alive (p_intf) )
{
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
/*
* Have we timed-out in showing a still frame?
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
if( p_vout == NULL )
{
if( p_input == NULL )
return VLC_EGENERIC;
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
p_intf->p_sys->p_input = p_input;
p_intf->p_sys->p_vcdplayer = NULL;
p_intf->p_sys->b_click = false;
p_intf->p_sys->b_key_pressed = false;
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
/* make sure we return a value */
return 0;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
intf_thread_t *p_intf = (intf_thread_t *)p_data;
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
p_intf->p_sys->b_key_pressed = true;
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
return VLC_SUCCESS;
}
*****************************************************************************/
int vcdIntfStillTime( intf_thread_t *p_intf, uint8_t i_sec )
{
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
p_intf->p_sys->b_still = 1;
if( 255 == i_sec )
{
p_intf->p_sys->m_still_time = MILLISECONDS_PER_SEC * i_sec;
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
return VLC_SUCCESS;
}
*****************************************************************************/
int vcdIntfResetStillTime( intf_thread_t *p_intf )
{
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
p_intf->p_sys->m_still_time = 0;
var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
return VLC_SUCCESS;
}