Replaced a certain amount of vlc_object_find by pl_Yield

[vlc] / modules / video_output / fb.c

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 787cb89f787e265e901f46d524284ff16b96f88e..9fba636c6d0f2e6f1df305f819783b603811050c 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -42,7 +42,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 /*****************************************************************************
@@ -116,7 +117,7 @@ vlc_module_begin();
                  true );
     add_bool( "fb-hw-accel", true, NULL, HW_ACCEL_TEXT, HW_ACCEL_LONGTEXT,
               true );
-    set_description( _("GNU/Linux console framebuffer video output") );
+    set_description( N_("GNU/Linux console framebuffer video output") );
     set_capability( "video output", 30 );
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -157,13 +158,13 @@ struct vout_sys_t
     vlc_fourcc_t i_chroma;
 
     /* Video memory */
-    byte_t *    p_video;                                      /* base adress */
+    uint8_t *    p_video;                                     /* base adress */
     size_t      i_page_size;                                    /* page size */
 };
 
 struct picture_sys_t
 {
-    byte_t *    p_data;                                       /* base adress */
+    uint8_t *    p_data;                                      /* base adress */
 };
 
 /*****************************************************************************
@@ -185,10 +186,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate instance and initialize some members */
     p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
-    };
     memset( p_sys, 0, sizeof(vout_sys_t) );
 
     p_vout->pf_init = Init;
@@ -751,8 +749,8 @@ static int panned=0;
 
     if( !p_vout->p_sys->b_hw_accel )
     {
-        p_vout->p_libvlc->pf_memcpy( p_vout->p_sys->p_video, p_pic->p->p_pixels,
-                                     p_vout->p_sys->i_page_size );
+        vlc_memcpy( p_vout->p_sys->p_video, p_pic->p->p_pixels,
+                    p_vout->p_sys->i_page_size );
     }
 }
 
@@ -873,8 +871,6 @@ static int OpenDisplay( vout_thread_t *p_vout )
         p_sys->p_palette = malloc( 8 * 256 * sizeof( uint16_t ) );
         if( !p_sys->p_palette )
         {
-            msg_Err( p_vout, "out of memory" );
-
             /* Restore fb config */
             ioctl( p_sys->i_fd, FBIOPUT_VSCREENINFO, &p_sys->old_info );