X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Ffb.c;h=c6879f3c11da1d8aab25de06daa800b28df355c8;hb=22fdf98f4ce8ea6d3a48da5daa0b3c9fe41e13fe;hp=7e74586812365c841f98e731d53601a76133740e;hpb=53e6127968a8a71ebe322eeff21dd86b259ca3c3;p=vlc

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 7e74586812..c6879f3c11 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <errno.h>                                                 /* ENOMEM */
 #include <signal.h>                                      /* SIGUSR1, SIGUSR2 */
 #include <fcntl.h>                                                 /* open() */
 #include <unistd.h>                                               /* close() */
@@ -75,7 +74,7 @@
     "in software.")
 
 #define CHROMA_TEXT N_("Image format (default RGB).")
-#define CHROMA_LONGTEXT N_("Chroma fourcc used by the framebuffer. Default is RGB since the fb device has no way to repot its chroma.")
+#define CHROMA_LONGTEXT N_("Chroma fourcc used by the framebuffer. Default is RGB since the fb device has no way to report its chroma.")
 
 static int  Open (vlc_object_t *);
 static void Close(vlc_object_t *);
@@ -153,13 +152,11 @@ struct vout_display_sys_t {
 };
 
 
-static void clear_screen(vout_display_sys_t *sys)
+static void ClearScreen(vout_display_sys_t *sys)
 {
-    switch (sys->chroma)
-    {
+    switch (sys->chroma) {
     /* XXX: add other chromas */
-    case VLC_CODEC_UYVY:
-    {
+    case VLC_CODEC_UYVY: {
         unsigned int j, size = sys->video_size / 4;
         uint32_t *ptr = (uint32_t*)((uintptr_t)(sys->video_ptr + 3) & ~3);
         for(j=0; j < size; j++)
@@ -226,19 +223,17 @@ static int Open(vlc_object_t *object)
         break;
     }
 
-    char *psz_chroma = var_CreateGetNonEmptyString (vd, "fb-chroma");
-    if (psz_chroma)
-    {
-        sys->chroma = vlc_fourcc_GetCodecFromString (VIDEO_ES, psz_chroma);
+    char *chroma = var_CreateGetNonEmptyString(vd, "fb-chroma");
+    if (chroma) {
+        sys->chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma);
 
         if (sys->chroma)
-            msg_Dbg (vd, "forcing chroma '%s'", psz_chroma);
+            msg_Dbg(vd, "forcing chroma '%s'", chroma);
         else
-            msg_Warn (vd, "chroma %s invalid, using default", psz_chroma);
+            msg_Warn(vd, "chroma %s invalid, using default", chroma);
 
-        free(psz_chroma);
-    }
-    else
+        free(chroma);
+    } else
         sys->chroma = 0;
 
     /* tty handling */
@@ -260,15 +255,12 @@ static int Open(vlc_object_t *object)
     /* */
     video_format_t fmt = vd->fmt;
 
-    if (sys->chroma)
-    {
+    if (sys->chroma) {
         fmt.i_chroma = sys->chroma;
-    }
-    else
-    {
+    } else {
         /* Assume RGB */
 
-        msg_Dbg (vd, "%d bppd", sys->var_info.bits_per_pixel);
+        msg_Dbg(vd, "%d bppd", sys->var_info.bits_per_pixel);
         switch (sys->var_info.bits_per_pixel) {
         case 8: /* FIXME: set the palette */
             fmt.i_chroma = VLC_CODEC_RGB8;
@@ -426,7 +418,7 @@ static void Manage (vout_display_t *vd)
 
         vout_display_SendEventDisplaySize();
 
-        clear_screen (vd->sys);
+        ClearScreen(vd->sys);
     }
 #endif
 }
@@ -671,7 +663,7 @@ static int OpenDisplay(vout_display_t *vd, bool force_resolution)
         return VLC_EGENERIC;
     }
 
-    clear_screen (sys);
+    ClearScreen(sys);
 
     msg_Dbg(vd,
             "framebuffer type=%d, visual=%d, ypanstep=%d, ywrap=%d, accel=%d",
@@ -688,7 +680,7 @@ static void CloseDisplay(vout_display_t *vd)
     vout_display_sys_t *sys = vd->sys;
 
     if (sys->video_ptr != MAP_FAILED) {
-        clear_screen (sys);
+        ClearScreen(sys);
         munmap(sys->video_ptr, sys->video_size);
     }