*****************************************************************************/
struct intf_sys_t
{
+ vlc_mutex_t lock;
decoder_t * p_cmml_decoder;
input_thread_t * p_input;
return VLC_ENOMEM;
p_intf->pf_run = RunIntf;
+ vlc_mutex_init( &p_intf->p_sys->lock );
var_AddCallback( p_intf->p_libvlc, "key-action", KeyEvent, p_intf );
/* we also need to add the callback for "mouse-clicked", but do that later
vlc_object_release( p_intf->p_sys->p_cmml_decoder );
+ vlc_mutex_destroy( &p_intf->p_sys->lock );
free( p_intf->p_sys );
}
}
}
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_intf->p_sys->lock );
/*
* keyboard event
break;
}
p_intf->p_sys->i_key_action = 0;
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
(void) DisplayPendingAnchor( p_intf, p_vout );
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_cmml_decoder = p_cmml_decoder;
p_intf->p_sys->i_key_action = 0;
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
return VLC_SUCCESS;
}
VLC_UNUSED(p_this); VLC_UNUSED(psz_var);
VLC_UNUSED(oldval); VLC_UNUSED(newval);
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 );
+ /* FIXME: key presses might get lost here... */
p_intf->p_sys->i_key_action = newval.i_int;
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_intf->p_sys->lock );
return VLC_SUCCESS;
}