macosx: Fix controller playlist toggling to use the contentRect and not the window...

[vlc] / modules / control / lirc.c

diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 110bfee1d41a77a6e51b32f97ff26742861adcb8..0ae6fbb1faf8351274d0a73a39aa11e37fac18ed 100644 (file)
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_osd.h>
@@ -63,10 +63,10 @@ static void Run     ( intf_thread_t * );
  * 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 );
 
@@ -98,6 +98,7 @@ static int Open( vlc_object_t *p_this )
     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;
     }
@@ -109,6 +110,7 @@ static int Open( vlc_object_t *p_this )
     {
         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;
     }