#include <fcntl.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_osd.h>
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_shortname( _("Infrared") );
+ set_shortname( N_("Infrared") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_description( _("Infrared remote control interface") );
+ set_description( N_("Infrared remote control interface") );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
add_string( "lirc-file", NULL, NULL,
- LIRC_TEXT, LIRC_LONGTEXT, VLC_TRUE );
+ LIRC_TEXT, LIRC_LONGTEXT, true );
vlc_module_end();
/*****************************************************************************
if( i_fd == -1 )
{
msg_Err( p_intf, "lirc initialisation failed" );
+ free( p_intf->p_sys->psz_file );
free( p_intf->p_sys );
return 1;
}
{
msg_Err( p_intf, "failure while reading lirc config" );
lirc_deinit();
+ free( p_intf->p_sys->psz_file );
free( p_intf->p_sys );
return 1;
}
intf_thread_t *p_intf = (intf_thread_t *)p_this;
/* Destroy structure */
- if( p_intf->p_sys->psz_file )
- free( p_intf->p_sys->psz_file );
+ free( p_intf->p_sys->psz_file );
lirc_freeconfig( p_intf->p_sys->config );
lirc_deinit();
free( p_intf->p_sys );