A bit of headers cleanup

[vlc] / modules / video_output / hd1000v.cpp

diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp
index b37f2c1043f63035b86928dee4a0d168b26e9a88..255eb95a28ec24bab9ed8526c22625546141933a 100644 (file)
--- a/modules/video_output/hd1000v.cpp
+++ b/modules/video_output/hd1000v.cpp
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * hd1000v.cpp: HD1000 video output display method
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: hd1000v.cpp 6961 2004-03-05 17:34:23Z jpsaman $
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
  *
- * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ * Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -30,8 +30,8 @@ extern "C" {
 #include <string.h>                                            /* strerror() */
 
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
+#include <vlc_vout.h>
+#include <vlc_playlist.h>
 }
 
 #include <cascade/graphics/CascadeBitmap.h>
@@ -55,7 +55,7 @@ static void FreePicture( vout_thread_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("HD1000 video output") );
-    set_capability( "video output", 10 );
+    set_capability( "video output", 100 );
     add_shortcut( "hd1000v" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -141,7 +141,7 @@ static int Create( vlc_object_t *p_this )
             (u32) p_vout->p_sys->i_width,
             (u32) p_vout->p_sys->i_height,
             (u8) p_vout->p_sys->i_screen_depth,
-            b_double_buffered);
+            b_double_buffered );
     p_vout->p_sys->b_double_buffered = (vlc_bool_t) 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. */
@@ -213,6 +213,7 @@ static int Init( vout_thread_t *p_vout )
 
     /* Allocate the picture */
     p_pic->p->i_lines = p_vout->p_sys->i_height;
+    p_pic->p->i_visible_lines = p_vout->p_sys->i_height;
     p_pic->p->i_pitch = p_vout->p_sys->i_width;
     p_pic->p->i_pixel_pitch = 1;
     p_pic->p->i_visible_pitch = p_vout->p_sys->i_width;
@@ -277,6 +278,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic )
     }
     
     p_pic->p->i_lines = p_vout->output.i_height;
+    p_pic->p->i_visible_lines = p_vout->output.i_height;
     p_pic->p->p_pixels = (uint8_t*) p_pic->p_sys->p_image->MapLock();
     p_pic->p->i_pitch = p_vout->p_sys->i_screen_depth;
     p_pic->p->i_visible_pitch = p_pic->p->i_pixel_pitch