Fix commit.

[vlc] / modules / video_output / svgalib.c

diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c
index 344bd2c7980b9e9f26b043366d02171a6afe14f4..0563758344657347ef2041ab5ecdf1878acc0746 100644 (file)
--- a/modules/video_output/svgalib.c
+++ b/modules/video_output/svgalib.c
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * svgalib.c : SVGAlib plugin for vlc
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: svgalib.c,v 1.2 2002/08/21 17:31:58 sam Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,16 +18,20 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_vout.h>
 
 #include <vga.h>
 #include <vgagl.h>
@@ -44,13 +48,16 @@ static void End       ( vout_thread_t * );
 static int  Manage    ( vout_thread_t * );
 static void Display   ( vout_thread_t *, picture_t * );
 
-static void SetPalette( vout_thread_t *, u16 *, u16 *, u16 * );
+static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();                                            
-    set_description( _("SVGAlib module") );
+vlc_module_begin();
+    set_shortname( "SVGAlib" );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VOUT );
+    set_description( N_("SVGAlib video output") );
     set_capability( "video output", 0 );
     set_callbacks( Create, Destroy );
     linked_with_a_crap_library_which_uses_atexit();
@@ -166,16 +173,16 @@ static int Init( vout_thread_t *p_vout )
             break;
         }
     }
-    
+
     /* Allocate the picture */
     if( p_pic == NULL )
     {
         return VLC_SUCCESS;
     }
 
-    vout_AllocatePicture( p_vout, p_pic, p_vout->output.i_width,
-                          p_vout->output.i_height,
-                          p_vout->output.i_chroma );
+    vout_AllocatePicture( p_vout, p_pic, p_vout->output.i_chroma,
+                          p_vout->output.i_width, p_vout->output.i_height,
+                          p_vout->output.i_aspect );
 
     if( p_pic->i_planes == 0 )
     {
@@ -228,7 +235,7 @@ static int Manage( vout_thread_t *p_vout )
     if( keyboard_keypressed(SCANCODE_ESCAPE)
          || keyboard_keypressed(SCANCODE_Q ) )
     {
-        p_vout->p_vlc->b_die = VLC_TRUE;
+        vlc_object_kill( p_vout->p_libvlc );
     }
 
     return VLC_SUCCESS;
@@ -250,7 +257,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
  *****************************************************************************
  * TODO: support 8 bits clut (for Mach32 cards and others).
  *****************************************************************************/
-static void SetPalette( vout_thread_t *p_vout, u16 *red, u16 *green, u16 *blue )
+static void SetPalette( vout_thread_t *p_vout,
+                        uint16_t *red, uint16_t *green, uint16_t *blue )
 {
     int i = 256;