# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#endif
#include "vlc_keys.h"
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
/* FIXME we should find a better way than including that */
#include "../../src/text/iso-639_def.h"
static void Close( vlc_object_t * );
vlc_module_begin();
- set_shortname( _("DVD with menus") );
- set_description( _("DVDnav Input") );
+ set_shortname( N_("DVD with menus") );
+ set_description( N_("DVDnav Input") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT,
var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev );
/* main loop */
- while( !p_ev->b_die )
+ while( vlc_object_alive (p_ev) )
{
bool b_activated = false;
{
pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
- vlc_value_t valk;
- int i;
-
vlc_mutex_lock( &p_ev->lock );
switch( p_ev->i_key_action )
{
p_ev->b_clicked = false;
vlc_mutex_unlock( &p_ev->lock );
}
- if( p_vout && p_vout->b_die )
+ if( p_vout && !vlc_object_alive (p_vout) )
{
var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev );
var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev );