X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fhd1000v.cpp;h=e5cbf29df0671c8dba2650435e6449c1f3831705;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=266ad670bbc3e189c5e8ce490eb10c27fad14b50;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc

diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp
index 266ad670bb..e5cbf29df0 100644
--- a/modules/video_output/hd1000v.cpp
+++ b/modules/video_output/hd1000v.cpp
@@ -27,7 +27,12 @@
 extern "C" {
 #include <errno.h>                                                 /* ENOMEM */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>
 }
@@ -52,7 +57,7 @@ static void FreePicture( vout_thread_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("HD1000 video output") );
+    set_description( N_("HD1000 video output") );
     set_capability( "video output", 100 );
     add_shortcut( "hd1000v" );
     set_callbacks( Create, Destroy );
@@ -69,7 +74,7 @@ struct vout_sys_t
     uint32_t            i_width;                     /* width of main window */
     uint32_t            i_height;                   /* height of main window */
     uint32_t            i_screen_depth;
-    vlc_bool_t          b_double_buffered;
+    bool          b_double_buffered;
  
     uint32_t            u_current; /* Current output resolution. */
     CascadeScreen      *p_screen;
@@ -92,10 +97,7 @@ static int Create( vlc_object_t *p_this )
  
     p_vout->p_sys = (struct vout_sys_t*) malloc( sizeof(struct vout_sys_t) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
 
     /* Allocate a screen for VLC vout. */
     p_vout->p_sys->p_screen = new CascadeScreen();
@@ -140,7 +142,7 @@ static int Create( vlc_object_t *p_this )
             (u32) p_vout->p_sys->i_height,
             (u8) p_vout->p_sys->i_screen_depth,
             b_double_buffered );
-    p_vout->p_sys->b_double_buffered = (vlc_bool_t) b_double_buffered;
+    p_vout->p_sys->b_double_buffered = (bool) b_double_buffered;
     msg_Dbg( p_vout, "using screen index = %u, width = %u, height = %u, depth = %u, double buffered = %d",
             p_vout->p_sys->u_current, /* Current screen. */
             p_vout->p_sys->i_width,