X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fomapfb.c;h=9646cbdfba57a7c68e0febcc1a89780a9818be1d;hb=2b297e104ec1a84863bf86990fd159b25318fa90;hp=45d77161e4f21e12ee4de51ddcf86a242efab3f7;hpb=d466fd4185ffd791413658e948205e2676d2f470;p=vlc

diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c
index 45d77161e4..9646cbdfba 100644
--- a/modules/video_output/omapfb.c
+++ b/modules/video_output/omapfb.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <errno.h>                                                 /* ENOMEM */
 #include <fcntl.h>                                                 /* open() */
 #include <unistd.h>                                               /* close() */
 
@@ -46,7 +45,7 @@
 #include <vlc_vout.h>
 #include <vlc_vout_window.h>
 #include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /*****************************************************************************
 * Local prototypes
@@ -80,7 +79,7 @@ static void ToggleFullScreen ( vout_thread_t * );
 #define DEVICE_LONGTEXT N_( \
     "OMAP Framebuffer device to use for rendering (usually /dev/fb0).")
 
-#define CHROMA_TEXT N_("Chroma used.")
+#define CHROMA_TEXT N_("Chroma used")
 #define CHROMA_LONGTEXT N_( \
     "Force use of a specific chroma for output. Default is Y420 (specific to N770/N8xx hardware)." )
 
@@ -89,7 +88,7 @@ static void ToggleFullScreen ( vout_thread_t * );
     "Embed the framebuffer overlay into a X11 window" )
 
 vlc_module_begin();
-    set_shortname( "OMAP framebuffer" );
+    set_shortname( N_("OMAP framebuffer") );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
@@ -456,7 +455,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
         return VLC_EGENERIC;
     }
 
-    p_sys->i_fd = utf8_open( psz_device, O_RDWR );
+    p_sys->i_fd = vlc_open( psz_device, O_RDWR );
     if( p_sys->i_fd == -1 )
     {
         msg_Err( p_vout, "cannot open %s (%m)", psz_device );
@@ -507,7 +506,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
     p_sys->p_display = XOpenDisplay( NULL );
 
     /* Open /dev/null and map it */
-    p_sys->i_null_fd = utf8_open( "/dev/zero", O_RDWR );
+    p_sys->i_null_fd = vlc_open( "/dev/zero", O_RDWR );
     if( p_sys->i_null_fd == -1 )
     {
         msg_Err( p_vout, "cannot open /dev/zero (%m)" );
@@ -612,7 +611,7 @@ static void CreateWindow( vout_sys_t *p_sys )
     xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask
                                   | VisibilityChangeMask;
     p_sys->window = XCreateWindow( p_sys->p_display,
-                                   p_sys->owner_window->xid,
+                                   p_sys->owner_window->handle.xid,
                                    0, 0,
                                    p_sys->main_window.i_width,
                                    p_sys->main_window.i_height,
@@ -622,7 +621,7 @@ static void CreateWindow( vout_sys_t *p_sys )
                                    &xwindow_attributes );
 
     XMapWindow( p_sys->p_display, p_sys->window );
-    XSelectInput( p_sys->p_display, p_sys->owner_window->xid,
+    XSelectInput( p_sys->p_display, p_sys->owner_window->handle.xid,
                   StructureNotifyMask );
 }