* ./src/video_output/video_output.c: don't try to change aspect ratio if it

    has been overriden by the user (Closes: #79).
  * ./modules/access/dvd/access.c: renamed "dvd-css-method" to "dvdcss-method".
  * ./modules/*: fixed a few capitalization issues.

.cvsignore

@@ -34,7 +34,4 @@ vlc-log.*
 vlc-config
 vlc
 vlc.app
-gvlc
-qvlc
-kvlc
-gnome-vlc
+vlc.exe

include/video_output.h

@@ -5,7 +5,7 @@
  * thread, and destroy a previously opened video output thread.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.91 2003/01/28 12:30:44 gbazin Exp $
+ * $Id: video_output.h,v 1.92 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -75,6 +75,7 @@ struct vout_thread_t
     vlc_bool_t          b_interface;                     /* render interface */
     vlc_bool_t          b_scale;                    /* allow picture scaling */
     vlc_bool_t          b_fullscreen;           /* toogle fullscreen display */
+    vlc_bool_t          b_override_aspect;         /* aspect ratio overriden */
     mtime_t             render_time;             /* last picture render time */
     unsigned int        i_window_width;                /* video window width */
     unsigned int        i_window_height;              /* video window height */

modules/access/dvd/access.c

@@ -8,7 +8,7 @@
  *  -udf.* to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: access.c,v 1.8 2002/12/31 01:54:35 massiot Exp $
+ * $Id: access.c,v 1.9 2003/01/28 22:03:21 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -124,7 +124,7 @@ int E_(DVDOpen) ( vlc_object_t *p_this )
 
     /* override environment variable DVDCSS_METHOD with config option
      * (FIXME: this creates a small memory leak) */
-    psz_dvdcss_env = config_GetPsz( p_input, "dvd-css-method" );
+    psz_dvdcss_env = config_GetPsz( p_input, "dvdcss-method" );
     if( psz_dvdcss_env && *psz_dvdcss_env )
     {
         char *psz_env;

modules/access/dvd/dvd.c

@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: dvd.c,v 1.3 2002/08/26 09:12:46 sam Exp $
+ * $Id: dvd.c,v 1.4 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -84,7 +84,7 @@ static char *cssmethod_list[] = { "title", "disc", "key", NULL };
 vlc_module_begin();
     int i;
     add_category_hint( N_("[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"), NULL );
-    add_string_from_list( "dvd-css-method", NULL, cssmethod_list, NULL,
+    add_string_from_list( "dvdcss-method", NULL, cssmethod_list, NULL,
                           CSSMETHOD_TEXT, CSSMETHOD_LONGTEXT );
 #ifdef GOD_DAMN_DMCA
     set_description( _("DVD input module, uses libdvdcss if installed") );

modules/audio_output/oss.c

@@ -2,7 +2,7 @@
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.47 2003/01/27 21:35:06 jobi Exp $
+ * $Id: oss.c,v 1.48 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -92,13 +92,13 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define BUGGY_TEXT N_("Try to work around buggy OSS drivers")
+#define BUGGY_TEXT N_("try to work around buggy OSS drivers")
 #define BUGGY_LONGTEXT N_( \
     "Some buggy OSS drivers just don't like when their internal buffers " \
     "are completely filled (the sound gets heavily hashed). If you have one " \
     "of these drivers, then you need to enable this option." )
 
-#define SPDIF_TEXT N_("Try to use S/PDIF output")
+#define SPDIF_TEXT N_("try to use S/PDIF output")
 #define SPDIF_LONGTEXT N_( \
     "Sometimes we attempt to use the S/PDIF output, even if nothing is " \
     "connected to it. Un-checking this option disables this behaviour, " \

modules/codec/spudec/spudec.c

@@ -2,7 +2,7 @@
  * spudec.c : SPU decoder thread
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: spudec.c,v 1.12 2003/01/20 02:45:25 titer Exp $
+ * $Id: spudec.c,v 1.13 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -10,7 +10,7 @@
  * 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
@@ -36,7 +36,7 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static int  OpenDecoder   ( vlc_object_t * );      
+static int  OpenDecoder   ( vlc_object_t * );
 static int  RunDecoder    ( decoder_fifo_t * );
 static int  InitThread    ( spudec_thread_t * );
 static void EndThread     ( spudec_thread_t * );
@@ -44,7 +44,7 @@ static void EndThread     ( spudec_thread_t * );
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
-#define FONT_TEXT N_("Font used by the text subtitler")
+#define FONT_TEXT N_("font used by the text subtitler")
 #define FONT_LONGTEXT N_(\
     "When the subtitles are coded in text form then, you can choose " \
     "which font will be used to display them.")
@@ -68,7 +68,7 @@ vlc_module_end();
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
  *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able 
+ * Tries to launch a decoder and return score so that the interface is able
  * to chose.
  *****************************************************************************/
 static int OpenDecoder( vlc_object_t *p_this )
@@ -105,7 +105,7 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
         DecoderError( p_fifo );
         return( -1 );
     }
-    
+
     /*
      * Initialize the thread properties
      */
@@ -239,12 +239,12 @@ static int InitThread( spudec_thread_t *p_spudec )
  *****************************************************************************/
 static void EndThread( spudec_thread_t *p_spudec )
 {
-    if( p_spudec->p_vout != NULL 
+    if( p_spudec->p_vout != NULL
          && p_spudec->p_vout->p_subpicture != NULL )
     {
         subpicture_t *  p_subpic;
         int             i_subpic;
-    
+
         for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
         {
             p_subpic = &p_spudec->p_vout->p_subpicture[i_subpic];
@@ -259,7 +259,7 @@ static void EndThread( spudec_thread_t *p_spudec )
 
         vlc_object_release( p_spudec->p_vout );
     }
-    
+
     CloseBitstream( &p_spudec->bit_stream );
     free( p_spudec );
 }

modules/gui/kde/kde.cpp

@@ -2,7 +2,7 @@
  * kde.cpp : KDE plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: kde.cpp,v 1.6 2003/01/28 21:08:29 sam Exp $
+ * $Id: kde.cpp,v 1.7 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
  *
@@ -10,7 +10,7 @@
  * 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
@@ -88,7 +88,7 @@ static void close(vlc_object_t *p_this)
     {
         vlc_object_release( p_intf->p_sys->p_input );
     }
-    
+
     delete p_intf->p_sys->p_app;
     delete p_intf->p_sys->p_about;
     msg_Unsubscribe(p_intf, p_intf->p_sys->p_msg);

modules/video_filter/clone.c

@@ -2,7 +2,7 @@
  * clone.c : Clone video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002, 2003 VideoLAN
- * $Id: clone.c,v 1.5 2003/01/17 16:18:03 sam Exp $
+ * $Id: clone.c,v 1.6 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -50,7 +50,7 @@ static int  SendEvents( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define COUNT_TEXT N_("Number of clones")
+#define COUNT_TEXT N_("number of clones")
 #define COUNT_LONGTEXT N_("Select the number of video windows in which to "\
     "clone the video")
 

modules/video_filter/motionblur.c

@@ -2,7 +2,7 @@
  * motion_blur.c : motion blur filter for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: motionblur.c,v 1.6 2003/01/17 16:18:03 sam Exp $
+ * $Id: motionblur.c,v 1.7 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -51,7 +51,7 @@ static int  SendEvents( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define MODE_TEXT N_("Blur factor")
+#define MODE_TEXT N_("blur factor")
 #define MODE_LONGTEXT N_("The degree of blurring from 1 to 127")
 
 vlc_module_begin();

src/video_output/video_output.c

@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppened video output thread.
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.209 2003/01/28 13:07:45 gbazin Exp $
+ * $Id: video_output.c,v 1.210 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -140,7 +140,8 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout,
         if( ( p_vout->render.i_width != i_width ) ||
             ( p_vout->render.i_height != i_height ) ||
             ( p_vout->render.i_chroma != i_chroma ) ||
-            ( p_vout->render.i_aspect != i_aspect ) ||
+            ( p_vout->render.i_aspect != i_aspect
+                    && !p_vout->b_override_aspect ) ||
             p_vout->b_filter_change )
         {
             /* We are not interested in this format, close this vout */
@@ -195,6 +196,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
     val.b_bool = VLC_TRUE;
     var_Set( p_vout, "intf-change", val );
 
+    p_vout->b_override_aspect = VLC_FALSE;
+
     /* If the parent is not a VOUT object, that means we are at the start of
      * the video output pipe */
     if( p_parent->i_object_type != VLC_OBJECT_VOUT )
@@ -230,6 +233,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
                          i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
 
                 i_aspect = i_new_aspect;
+
+                p_vout->b_override_aspect = VLC_TRUE;
             }
         }
 
@@ -316,7 +321,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
     p_vout->b_scale      = 1;
     p_vout->b_fullscreen = 0;
     p_vout->render_time  = 10;
-    p_vout->c_fps_samples= 0;
+    p_vout->c_fps_samples = 0;
     p_vout->b_filter_change = 0;
 
     /* Mouse coordinates */