* backport of [11257] to trunk

[vlc] / modules / video_output / fb.c

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 78fd4a68db5589c4bf4a649ca4867e258c2f8188..0cca7d4338d1cff4fa7171161921c44eeac4b515 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -2,7 +2,7 @@
  * fb.c : framebuffer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: fb.c,v 1.8 2004/01/26 16:45:02 zorglub Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -67,9 +67,12 @@ static void GfxMode        ( int i_tty );
 #define DEVICE_TEXT N_("Framebuffer device")
 #define DEVICE_LONGTEXT N_( \
     "You can select here the framebuffer device that will be used " \
-    "for rendering (ususally /dev/fb0).")
+    "for rendering (usually /dev/fb0).")
 
 vlc_module_begin();
+    set_shortname( "FB" );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VOUT );
     add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
               VLC_FALSE );
     set_description( _("GNU/Linux console framebuffer video output") );
@@ -85,19 +88,19 @@ vlc_module_end();
  *****************************************************************************/
 struct vout_sys_t
 {
-    /* System informations */
+    /* System information */
     int                 i_tty;                          /* tty device handle */
     struct termios      old_termios;
 
-    /* Original configuration informations */
+    /* Original configuration information */
     struct sigaction            sig_usr1;           /* USR1 previous handler */
     struct sigaction            sig_usr2;           /* USR2 previous handler */
     struct vt_mode              vt_mode;                 /* previous VT mode */
 
     /* Framebuffer information */
     int                         i_fd;                       /* device handle */
-    struct fb_var_screeninfo    old_info;      /* original mode informations */
-    struct fb_var_screeninfo    var_info;       /* current mode informations */
+    struct fb_var_screeninfo    old_info;       /* original mode information */
+    struct fb_var_screeninfo    var_info;        /* current mode information */
     vlc_bool_t                  b_pan;     /* does device supports panning ? */
     struct fb_cmap              fb_cmap;                /* original colormap */
     uint16_t                    *p_palette;              /* original palette */
@@ -298,6 +301,7 @@ static int Init( vout_thread_t *p_vout )
     p_pic->p->p_pixels = p_vout->p_sys->p_video;
     p_pic->p->i_pixel_pitch = p_vout->p_sys->i_bytes_per_pixel;
     p_pic->p->i_lines = p_vout->p_sys->var_info.yres;
+    p_pic->p->i_visible_lines = p_vout->p_sys->var_info.yres;
 
     if( p_vout->p_sys->var_info.xres_virtual )
     {
@@ -482,7 +486,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
     }
     free( psz_device );
 
-    /* Get framebuffer device informations */
+    /* Get framebuffer device information */
     if( ioctl( p_vout->p_sys->i_fd,
                FBIOGET_VSCREENINFO, &p_vout->p_sys->var_info ) )
     {
@@ -507,7 +511,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
         return VLC_EGENERIC;
     }
 
-    /* Get some informations again, in the definitive configuration */
+    /* Get some information again, in the definitive configuration */
     if( ioctl( p_vout->p_sys->i_fd, FBIOGET_FSCREENINFO, &fix_info )
          || ioctl( p_vout->p_sys->i_fd,
                    FBIOGET_VSCREENINFO, &p_vout->p_sys->var_info ) )