Removed non converted svgalib video output module.

[vlc] / modules / video_output / hd1000v.cpp

diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp
index 70fb464798a9d4cb0909d34764df01a064a18831..823a3d419093035ece31994880b16c3259a92544 100644 (file)
--- a/modules/video_output/hd1000v.cpp
+++ b/modules/video_output/hd1000v.cpp
@@ -25,13 +25,12 @@
  * Preamble
  *****************************************************************************/
 extern "C" {
-#include <errno.h>                                                 /* ENOMEM */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>
 }
@@ -55,12 +54,12 @@ static void FreePicture( vout_thread_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("HD1000 video output") );
-    set_capability( "video output", 100 );
-    add_shortcut( "hd1000v" );
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("HD1000 video output") )
+    set_capability( "video output", 100 )
+    add_shortcut( "hd1000v" )
+    set_callbacks( Create, Destroy )
+vlc_module_end ()
 
 /*****************************************************************************
  * vout_sys_t: video output method descriptor
@@ -73,7 +72,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;
@@ -96,10 +95,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();
@@ -144,7 +140,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,
@@ -173,7 +169,7 @@ static int Init( vout_thread_t *p_vout )
 
     I_OUTPUTPICTURES = 0;
 
-    p_vout->output.i_chroma = VLC_FOURCC('R','G','B','2');
+    p_vout->output.i_chroma = VLC_CODEC_RGB8;
     p_vout->output.i_width = p_vout->p_sys->i_width;
     p_vout->output.i_height = p_vout->p_sys->i_height;
     p_vout->output.i_aspect = p_vout->p_sys->i_width
@@ -183,15 +179,15 @@ static int Init( vout_thread_t *p_vout )
     switch( p_vout->p_sys->i_screen_depth )
     {
         case 8: /* FIXME: set the palette */
-            p_vout->output.i_chroma = VLC_FOURCC('R','G','B','2'); break;
+            p_vout->output.i_chroma = VLC_CODEC_RGB8; break;
         case 15:
-            p_vout->output.i_chroma = VLC_FOURCC('R','V','1','5'); break;
+            p_vout->output.i_chroma = VLC_CODEC_RGB15; break;
         case 16:
-            p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break;
+            p_vout->output.i_chroma = VLC_CODEC_RGB16; break;
         case 24:
-            p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break;
+            p_vout->output.i_chroma = VLC_CODEC_RGB24; break;
         case 32:
-            p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break;
+            p_vout->output.i_chroma = VLC_CODEC_RGB32; break;
         default:
             msg_Err( p_vout, "unknown screen depth %i",
                      p_vout->p_sys->i_screen_depth );
@@ -259,9 +255,10 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic )
     }
 
     /* Fill in picture_t fields */
-    vout_InitPicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma,
-                      p_vout->output.i_width, p_vout->output.i_height,
-                      p_vout->output.i_aspect );
+    picture_Setup( p_pic, p_vout->output.i_chroma,
+                   p_vout->output.i_width, p_vout->output.i_height,
+                   p_vout->output.i_aspect * p_vout->output.i_height,
+                   VOUT_ASPECT_FACTOR      * p_vout->output.i_width );
 
     p_pic->p_sys->p_image = new CascadeSharedMemZone();
     if( p_pic->p_sys->p_image == NULL )