* modules/misc/dummy/renderer.c:

    + Removed evil ^Ms from the file.
  * modules/video_output/caca.c:
    + Support for new dithering modes (libcaca HEAD only).
  * modules/* src/*:
    + Grammar and spelling fixes.
    + Coding style fixes.
  * po/fr.po:
    + Spelling fixes.
    + Updated a few translations.
  * po/en_GB.po:
    + Updated a few translations.

THANKS

-$Id: THANKS,v 1.13 2003/12/02 23:03:31 gbazin Exp $
+$Id: THANKS,v 1.14 2003/12/04 16:49:43 sam Exp $
 
 VLC makes extensive use of the following persons' code:
 
@@ -10,7 +10,7 @@ The VideoLAN team would like to thank the following contributors:
 
 Andr de Barros Martins Ribeiro <andrerib@ajato.com.br> - Brazilian portuguese localization
 Andres Krapf <dae@via.ecp.fr> - FreeBSD port and tests, KDE interface
-Andy Lindsay <andy_vl@ananam.com> - Fixes in the TS demux
+Andy Lindsay <andy_vl@ananam.com> - fixes in the TS demux
 Arkadiusz Lipiec <A.Lipiec@elka.pw.edu.pl> - Polish translation
 Arkadiusz Miskiewicz <misiek@pld.ORG.PL> - autoconf and Makefile patches
 Arnaud Gomes-do-Vale <arnaud@carrosse.frmug.org> - autoconf patches

include/video_output.h

@@ -2,7 +2,7 @@
  * video_output.h : video output thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.102 2003/11/19 00:06:06 sigmunau Exp $
+ * $Id: video_output.h,v 1.103 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -11,7 +11,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
@@ -73,7 +73,7 @@ struct vout_thread_t
     vlc_mutex_t         change_lock;                 /**< thread change lock */
     vout_sys_t *        p_sys;                     /**< system output method */
     /**@}*/
-    
+
     /** \name Current display properties */
     /**@{*/
     uint16_t            i_changes;          /**< changes made to the thread.
@@ -90,7 +90,7 @@ struct vout_thread_t
     unsigned int        i_window_height;            /**< video window height */
     unsigned int        i_alignment;          /**< video alignment in window */
     /**@}*/
-    
+
     /** \name Plugin used and shortcuts to access its capabilities */
     /**@{*/
     module_t *   p_module;
@@ -138,11 +138,11 @@ struct vout_thread_t
 
     /* text renderer data */
     text_renderer_sys_t * p_text_renderer_data;        /**< private data for
-						           the text renderer */
+                                                           the text renderer */
     module_t *            p_text_renderer_module;  /**< text renderer module */
     /** callback used when a new string needs to be shown on the vout */
-    int ( *pf_add_string ) ( vout_thread_t *, byte_t *, text_style_t *, int,  
-			     int, int, mtime_t, mtime_t ); 
+    int ( *pf_add_string ) ( vout_thread_t *, byte_t *, text_style_t *, int,
+                             int, int, mtime_t, mtime_t );
 };
 
 #define I_OUTPUTPICTURES p_vout->output.i_pictures
@@ -156,13 +156,13 @@ struct vout_thread_t
  * @{
  */
 /** b_info changed */
-#define VOUT_INFO_CHANGE        0x0001                   
+#define VOUT_INFO_CHANGE        0x0001
 /** b_grayscale changed */
-#define VOUT_GRAYSCALE_CHANGE   0x0002              
+#define VOUT_GRAYSCALE_CHANGE   0x0002
 /** b_interface changed */
-#define VOUT_INTF_CHANGE        0x0004              
+#define VOUT_INTF_CHANGE        0x0004
 /** b_scale changed */
-#define VOUT_SCALE_CHANGE       0x0008                  
+#define VOUT_SCALE_CHANGE       0x0008
 /** gamma changed */
 #define VOUT_GAMMA_CHANGE       0x0010
 /** b_cursor changed */

modules/access/cdda/cdda.c

@@ -2,7 +2,7 @@
  * cddax.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: cdda.c,v 1.8 2003/12/02 03:33:22 rocky Exp $
+ * $Id: cdda.c,v 1.9 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -74,7 +74,7 @@ int  E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name,
     "If you don't specify anything, we'll scan for a suitable CD-ROM device.")
 
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for cdda streams. This " \
+    "Allows you to modify the default caching value for CDDA streams. This " \
     "value should be set in millisecond units." )
 
 #define CDDB_TITLE_FMT_LONGTEXT N_( \

modules/access/dshow/dshow.cpp

@@ -2,7 +2,7 @@
  * dshow.cpp : DirectShow access module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: dshow.cpp,v 1.18 2003/12/02 23:03:31 gbazin Exp $
+ * $Id: dshow.cpp,v 1.19 2003/12/04 16:49:43 sam Exp $
  *
  * Author: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -124,8 +124,8 @@ static char *ppsz_adev_text[] = { N_("Default"), N_("None") };
 #define CHROMA_TEXT N_("Video input chroma format")
 #define CHROMA_LONGTEXT N_( \
     "Force the DirectShow video input to use a specific chroma format " \
-    "(eg. I420 (default), RV24, etc...)")
-#define CONFIG_TEXT N_("Show device properties dialog")
+    "(eg. I420 (default), RV24, etc.)")
+#define CONFIG_TEXT N_("Device properties")
 #define CONFIG_LONGTEXT N_( \
     "Show the properties dialog of the selected device")
 

modules/access/tcp.c

@@ -2,7 +2,7 @@
  * tcp.c: TCP access plug-in
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: tcp.c,v 1.1 2003/11/30 14:28:07 fenrir Exp $
+ * $Id: tcp.c,v 1.2 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -66,7 +66,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("TCP input") );
-    add_category_hint( N_("tcp"), NULL , VLC_TRUE );
+    add_category_hint( N_("TCP"), NULL , VLC_TRUE );
     add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
     set_capability( "access", 0 );
     add_shortcut( "tcp" );

modules/access/udp.c

@@ -2,7 +2,7 @@
  * udp.c: raw UDP & RTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.25 2003/11/07 18:32:55 fenrir Exp $
+ * $Id: udp.c,v 1.26 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Tristan Leteurtre <tooney@via.ecp.fr>
@@ -78,7 +78,7 @@ static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t );
 
 vlc_module_begin();
     set_description( _("UDP/RTP input") );
-    add_category_hint( N_("udp"), NULL , VLC_TRUE );
+    add_category_hint( N_("UDP"), NULL , VLC_TRUE );
     add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
     set_capability( "access", 0 );
     add_shortcut( "udp" );

modules/access/v4l/v4l.c

@@ -2,7 +2,7 @@
  * v4l.c : Video4Linux input module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.35 2003/11/26 22:00:56 gbazin Exp $
+ * $Id: v4l.c,v 1.36 2003/12/04 16:49:43 sam Exp $
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *         Paul Forgey <paulf at aphrodite dot com>
@@ -86,8 +86,8 @@ static void DemuxClose ( vlc_object_t * );
     "If you don't specify anything, no audio device will be used.")
 #define CHROMA_TEXT N_("Video input chroma format")
 #define CHROMA_LONGTEXT N_( \
-    "Force the v4l video device to use a specific chroma format " \
-    "(eg. I420 (default), RV24, etc...)")
+    "Force the Video4Linux video device to use a specific chroma format " \
+    "(eg. I420 (default), RV24, etc.)")
 
 vlc_module_begin();
     set_description( _("Video4Linux input") );

modules/codec/speex.c

@@ -2,7 +2,7 @@
  * speex.c: speex decoder/packetizer/encoder module making use of libspeex.
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: speex.c,v 1.5 2003/11/23 15:50:07 gbazin Exp $
+ * $Id: speex.c,v 1.6 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -388,7 +388,12 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
 
         i_ret = speex_decode( p_sys->p_state, &p_sys->bits,
                               (int16_t *)p_aout_buffer->p_buffer );
-        if( i_ret == -1 ) return NULL; /* End of stream */
+        if( i_ret == -1 )
+        {
+            /* End of stream */
+            return NULL;
+        }
+
         if( i_ret== -2 )
         {
             msg_Warn( p_dec, "Decoding error: corrupted stream?" );

modules/gui/wxwindows/streamwizard.cpp

@@ -2,7 +2,7 @@
  * stream.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: streamwizard.cpp,v 1.1 2003/10/29 18:54:46 gbazin Exp $
+ * $Id: streamwizard.cpp,v 1.2 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  *
@@ -38,9 +38,9 @@
 
 
 #define STREAM_INTRO N_( "Stream with VLC in three steps" )
-#define STREAM_STEP1 N_( "Step 1 : Select what to stream" )
-#define STREAM_STEP2 N_( "Step 2 : Define streaming method" )
-#define STREAM_STEP3 N_( "Step 3 : Start streaming" )
+#define STREAM_STEP1 N_( "Step 1: Select what to stream" )
+#define STREAM_STEP2 N_( "Step 2: Define streaming method" )
+#define STREAM_STEP3 N_( "Step 3: Start streaming" )
 
 
 /*****************************************************************************

modules/gui/wxwindows/v4l.cpp

@@ -2,7 +2,7 @@
  * v4l.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: v4l.cpp,v 1.4 2003/11/27 06:37:11 adn Exp $
+ * $Id: v4l.cpp,v 1.5 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Mohammed Adnne Trojette <adn@via.ecp.fr>
  *
@@ -305,7 +305,7 @@ wxPanel *V4LDialog::CommonPanel( wxWindow* parent )
                                          wxU(_("Frequency")) );
     frequency = new wxSpinCtrl( common_subpanel, Frequency_Event,
                                 wxT("479250") );
-    frequency->SetToolTip( wxU(_("The frequency in KHz" )) );
+    frequency->SetToolTip( wxU(_("The frequency in kHz" )) );
 
     subpanel_sizer->Add( frequency_checkbox, 0, wxALIGN_LEFT |
                          wxALIGN_CENTER_VERTICAL );

modules/misc/dummy/renderer.c

-/*****************************************************************************
- * renderer.c : dummy text rendering functions
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: renderer.c,v 1.1 2003/07/14 22:25:13 sigmunau Exp $
- *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
- *
- * 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
- * GNU General Public License for more details.
- *
- * 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.
- *****************************************************************************/
-
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-
-static int  AddText   ( vout_thread_t *, char *, text_style_t *, int, 
-			int, int, mtime_t, mtime_t );
-
-int E_(OpenRenderer)( vlc_object_t *p_this )
-{
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    p_vout->pf_add_string = AddText;
-    return VLC_SUCCESS;
-}
-
-static int  AddText   ( vout_thread_t *p_vout, char *psz_string,
-			text_style_t *p_style , int i_flags, int i_x_margin,
-			int i_y_margin, mtime_t i_start, mtime_t i_stop )
-{
-    return VLC_SUCCESS;
-}
+/*****************************************************************************
+ * renderer.c : dummy text rendering functions
+ *****************************************************************************
+ * Copyright (C) 2000, 2001 VideoLAN
+ * $Id: renderer.c,v 1.2 2003/12/04 16:49:43 sam Exp $
+ *
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ *
+ * 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
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+#include <vlc/vlc.h>
+#include <vlc/vout.h>
+
+static int  AddText   ( vout_thread_t *, byte_t *, text_style_t *, int,
+                        int, int, mtime_t, mtime_t );
+
+int E_(OpenRenderer)( vlc_object_t *p_this )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    p_vout->pf_add_string = AddText;
+    return VLC_SUCCESS;
+}
+
+static int  AddText   ( vout_thread_t *p_vout, byte_t *psz_string,
+                        text_style_t *p_style , int i_flags, int i_x_margin,
+                        int i_y_margin, mtime_t i_start, mtime_t i_stop )
+{
+    return VLC_SUCCESS;
+}
+

modules/misc/testsuite/test3.m

@@ -2,7 +2,7 @@
  * test3.m : Empty Objective C module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: test3.m,v 1.1 2002/10/04 13:13:54 sam Exp $
+ * $Id: test3.m,v 1.2 2003/12/04 16:49:43 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
@@ -34,11 +34,11 @@
 @class Desc;
 
 @interface Desc : Object
-+ (char*) ription;
++ (const char*) ription;
 @end
 
 @implementation Desc
-+ (char*) ription
++ (const char*) ription
 {
     return "Objective C module that does nothing";
 }

modules/video_output/caca.c

@@ -2,7 +2,7 @@
  * caca.c: Color ASCII Art video output plugin using libcaca
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: caca.c,v 1.3 2003/11/22 16:18:05 sam Exp $
+ * $Id: caca.c,v 1.4 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *
@@ -53,8 +53,15 @@ static void Display   ( vout_thread_t *, picture_t * );
 #define MODE_TEXT N_("dithering mode")
 #define MODE_LONGTEXT N_("Choose the libcaca dithering mode")
 
-static char *mode_list[] = { "none", "ordered", "random" };
-static char *mode_list_text[] = { N_("No dithering"), N_("Ordered dithering"),
+static char *mode_list[] = { "none",
+                             "ordered2",
+                             "ordered4",
+                             "ordered8",
+                             "random" };
+static char *mode_list_text[] = { N_("No dithering"),
+                                  N_("2x2 ordered dithering"),
+                                  N_("4x4 ordered dithering"),
+                                  N_("8x8 ordered dithering"),
                                   N_("Random dithering") };
 
 vlc_module_begin();
@@ -86,7 +93,7 @@ struct vout_sys_t
 static int Create( vlc_object_t *p_this )
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    enum caca_dithering dither = CACA_DITHER_ORDERED;
+    enum caca_dithering dither = CACA_DITHERING_ORDERED4;
     vlc_value_t val;
 
     /* Allocate structure */
@@ -110,11 +117,19 @@ static int Create( vlc_object_t *p_this )
     {
         if( !strcmp( val.psz_string, "none" ) )
         {
-            dither = CACA_DITHER_NONE;
+            dither = CACA_DITHERING_NONE;
+        }
+        else if( !strcmp( val.psz_string, "ordered2" ) )
+        {
+            dither = CACA_DITHERING_ORDERED2;
+        }
+        else if( !strcmp( val.psz_string, "ordered4" ) )
+        {
+            dither = CACA_DITHERING_ORDERED4;
         }
         else if( !strcmp( val.psz_string, "random" ) )
         {
-            dither = CACA_DITHER_RANDOM;
+            dither = CACA_DITHERING_RANDOM;
         }
         free( val.psz_string );
     }

modules/visualization/visual/visual.c

@@ -2,7 +2,7 @@
  * visual.c : Visualisation system
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: visual.c,v 1.11 2003/11/02 06:33:49 hartman Exp $
+ * $Id: visual.c,v 1.12 2003/12/04 16:49:43 sam Exp $
  *
  * Authors: Clment Stenac <zorglub@via.ecp.fr>
  *
@@ -50,7 +50,7 @@
 
 #define NBBANDS_TEXT N_( "Number of bands" )
 #define NBBANDS_LONGTEXT N_( \
-      "Number of bands used by spectrum analizer, should be 20 or 80" )
+      "Number of bands used by spectrum analyzer, should be 20 or 80" )
 
 #define SEPAR_TEXT N_( "Band separator" )
 #define SEPAR_LONGTEXT N_( \

po/POTFILES.in

@@ -117,6 +117,7 @@ modules/access/cdda.c
 modules/access/cdda/access.c
 modules/access/cdda/cdda.c
 modules/access/cdda/cdda.h
+modules/access/cdda/demux.c
 modules/access/cdda/intf.c
 modules/access/directory.c
 modules/access/dshow/dshow.cpp
@@ -176,6 +177,7 @@ modules/access/satellite/dvb.c
 modules/access/satellite/dvb.h
 modules/access/satellite/satellite.c
 modules/access/slp.c
+modules/access/tcp.c
 modules/access/udp.c
 modules/access/v4l/v4l.c
 modules/access/v4l/videodev_mjpeg.h
@@ -189,7 +191,6 @@ modules/access/vcdx/cdrom.h
 modules/access/vcdx/demux.c
 modules/access/vcdx/intf.c
 modules/access/vcdx/intf.h
-modules/access/vcdx/vcd-short.c
 modules/access/vcdx/vcd.c
 modules/access/vcdx/vcd.h
 modules/access/vcdx/vcdplayer.c
@@ -255,7 +256,6 @@ modules/codec/ffmpeg/postprocessing/postprocessing_common.h
 modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c
 modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c
 modules/codec/ffmpeg/video.c
-modules/codec/ffmpeg/video_filters.c
 modules/codec/flac.c
 modules/codec/libmpeg2.c
 modules/codec/lpcm.c
@@ -292,6 +292,7 @@ modules/demux/avi/libavi.c
 modules/demux/avi/libavi.h
 modules/demux/demuxdump.c
 modules/demux/demuxstream.c
+modules/demux/dts.c
 modules/demux/flac.c
 modules/demux/livedotcom.cpp
 modules/demux/m3u.c
@@ -386,28 +387,39 @@ modules/gui/gtk2/gtk2_support.c
 modules/gui/gtk2/gtk2_support.h
 modules/gui/kde/QConfigItem.cpp
 modules/gui/kde/QConfigItem.h
+modules/gui/kde/QConfigItem.moc.cpp
 modules/gui/kde/common.h
 modules/gui/kde/disc.cpp
 modules/gui/kde/disc.h
+modules/gui/kde/disc.moc.cpp
 modules/gui/kde/info.cpp
 modules/gui/kde/info.h
+modules/gui/kde/info.moc.cpp
 modules/gui/kde/interface.cpp
 modules/gui/kde/interface.h
+modules/gui/kde/interface.moc.cpp
 modules/gui/kde/kde.cpp
 modules/gui/kde/languagemenu.cpp
 modules/gui/kde/languagemenu.h
+modules/gui/kde/languagemenu.moc.cpp
 modules/gui/kde/menu.cpp
 modules/gui/kde/menu.h
+modules/gui/kde/menu.moc.cpp
 modules/gui/kde/messages.cpp
 modules/gui/kde/messages.h
+modules/gui/kde/messages.moc.cpp
 modules/gui/kde/net.cpp
 modules/gui/kde/net.h
+modules/gui/kde/net.moc.cpp
 modules/gui/kde/pluginsbox.cpp
 modules/gui/kde/pluginsbox.h
+modules/gui/kde/pluginsbox.moc.cpp
 modules/gui/kde/preferences.cpp
 modules/gui/kde/preferences.h
+modules/gui/kde/preferences.moc.cpp
 modules/gui/kde/slider.cpp
 modules/gui/kde/slider.h
+modules/gui/kde/slider.moc.cpp
 modules/gui/macosx/about.h
 modules/gui/macosx/about.m
 modules/gui/macosx/applescript.h
@@ -436,10 +448,6 @@ modules/gui/macosx/vout.m
 modules/gui/ncurses/ncurses.c
 modules/gui/pda/callbacks.c
 modules/gui/pda/callbacks.h
-modules/gui/pda/interface.c
-modules/gui/pda/interface.h
-modules/gui/pda/network.c
-modules/gui/pda/network.h
 modules/gui/pda/pda.c
 modules/gui/pda/pda.h
 modules/gui/pda/pda_callbacks.c
@@ -448,15 +456,12 @@ modules/gui/pda/pda_interface.c
 modules/gui/pda/pda_interface.h
 modules/gui/pda/pda_support.c
 modules/gui/pda/pda_support.h
-modules/gui/pda/playlist.c
-modules/gui/pda/playlist.h
-modules/gui/pda/support.c
-modules/gui/pda/support.h
 modules/gui/qnx/aout.c
 modules/gui/qnx/qnx.c
 modules/gui/qnx/vout.c
 modules/gui/qt/intf.cpp
 modules/gui/qt/intf.h
+modules/gui/qt/intf.moc.cpp
 modules/gui/qt/qt.cpp
 modules/gui/skins/controls/button.cpp
 modules/gui/skins/controls/button.h
@@ -547,129 +552,6 @@ modules/gui/skins/x11/x11_timer.cpp
 modules/gui/skins/x11/x11_timer.h
 modules/gui/skins/x11/x11_window.cpp
 modules/gui/skins/x11/x11_window.h
-modules/gui/skins2/commands/cmd_generic.h
-modules/gui/skins2/commands/cmd_open.cpp
-modules/gui/skins2/commands/cmd_open.h
-modules/gui/skins2/commands/cmd_quit.cpp
-modules/gui/skins2/commands/cmd_quit.h
-modules/gui/skins2/controls/ctrl_button.cpp
-modules/gui/skins2/controls/ctrl_button.h
-modules/gui/skins2/controls/ctrl_flat.h
-modules/gui/skins2/controls/ctrl_generic.cpp
-modules/gui/skins2/controls/ctrl_generic.h
-modules/gui/skins2/controls/ctrl_image.cpp
-modules/gui/skins2/controls/ctrl_image.h
-modules/gui/skins2/controls/ctrl_list.cpp
-modules/gui/skins2/controls/ctrl_list.h
-modules/gui/skins2/controls/ctrl_move.cpp
-modules/gui/skins2/controls/ctrl_move.h
-modules/gui/skins2/controls/ctrl_radialslider.cpp
-modules/gui/skins2/controls/ctrl_radialslider.h
-modules/gui/skins2/controls/ctrl_resize.cpp
-modules/gui/skins2/controls/ctrl_resize.h
-modules/gui/skins2/controls/ctrl_slider.cpp
-modules/gui/skins2/controls/ctrl_slider.h
-modules/gui/skins2/controls/ctrl_text.h
-modules/gui/skins2/events/evt_enter.h
-modules/gui/skins2/events/evt_generic.h
-modules/gui/skins2/events/evt_input.cpp
-modules/gui/skins2/events/evt_input.h
-modules/gui/skins2/events/evt_key.cpp
-modules/gui/skins2/events/evt_key.h
-modules/gui/skins2/events/evt_leave.h
-modules/gui/skins2/events/evt_motion.h
-modules/gui/skins2/events/evt_mouse.cpp
-modules/gui/skins2/events/evt_mouse.h
-modules/gui/skins2/events/evt_refresh.h
-modules/gui/skins2/events/evt_scroll.cpp
-modules/gui/skins2/events/evt_scroll.h
-modules/gui/skins2/events/evt_special.cpp
-modules/gui/skins2/events/evt_special.h
-modules/gui/skins2/parser/cmd_builder.cpp
-modules/gui/skins2/parser/cmd_builder.h
-modules/gui/skins2/parser/flex.c
-modules/gui/skins2/parser/skin.c
-modules/gui/skins2/parser/skin.h
-modules/gui/skins2/parser/wrappers.cpp
-modules/gui/skins2/parser/wrappers.h
-modules/gui/skins2/src/anchor.cpp
-modules/gui/skins2/src/anchor.h
-modules/gui/skins2/src/builder.cpp
-modules/gui/skins2/src/builder.h
-modules/gui/skins2/src/dialogs.cpp
-modules/gui/skins2/src/dialogs.h
-modules/gui/skins2/src/fixed_layout.cpp
-modules/gui/skins2/src/fixed_layout.h
-modules/gui/skins2/src/ft2_bitmap.cpp
-modules/gui/skins2/src/ft2_bitmap.h
-modules/gui/skins2/src/ft2_font.cpp
-modules/gui/skins2/src/ft2_font.h
-modules/gui/skins2/src/generic_bitmap.h
-modules/gui/skins2/src/generic_font.h
-modules/gui/skins2/src/generic_layout.cpp
-modules/gui/skins2/src/generic_layout.h
-modules/gui/skins2/src/generic_window.cpp
-modules/gui/skins2/src/generic_window.h
-modules/gui/skins2/src/os_factory.cpp
-modules/gui/skins2/src/os_factory.h
-modules/gui/skins2/src/os_graphics.h
-modules/gui/skins2/src/os_loop.h
-modules/gui/skins2/src/os_timer.h
-modules/gui/skins2/src/os_tooltip.h
-modules/gui/skins2/src/os_window.h
-modules/gui/skins2/src/playlist.cpp
-modules/gui/skins2/src/playlist.h
-modules/gui/skins2/src/png_bitmap.cpp
-modules/gui/skins2/src/png_bitmap.h
-modules/gui/skins2/src/skin_common.h
-modules/gui/skins2/src/skin_main.cpp
-modules/gui/skins2/src/tooltip.cpp
-modules/gui/skins2/src/tooltip.h
-modules/gui/skins2/src/volume.cpp
-modules/gui/skins2/src/volume.h
-modules/gui/skins2/src/window_manager.cpp
-modules/gui/skins2/src/window_manager.h
-modules/gui/skins2/utils/fsm.cpp
-modules/gui/skins2/utils/fsm.h
-modules/gui/skins2/utils/observer.h
-modules/gui/skins2/utils/pointer.h
-modules/gui/skins2/utils/position.cpp
-modules/gui/skins2/utils/position.h
-modules/gui/skins2/utils/thread.h
-modules/gui/skins2/utils/ustring.cpp
-modules/gui/skins2/utils/ustring.h
-modules/gui/skins2/utils/var_int.cpp
-modules/gui/skins2/utils/var_int.h
-modules/gui/skins2/utils/var_list.cpp
-modules/gui/skins2/utils/var_list.h
-modules/gui/skins2/utils/variable.h
-modules/gui/skins2/win32/win32_factory.cpp
-modules/gui/skins2/win32/win32_factory.h
-modules/gui/skins2/win32/win32_graphics.cpp
-modules/gui/skins2/win32/win32_graphics.h
-modules/gui/skins2/win32/win32_loop.cpp
-modules/gui/skins2/win32/win32_loop.h
-modules/gui/skins2/win32/win32_timer.cpp
-modules/gui/skins2/win32/win32_timer.h
-modules/gui/skins2/win32/win32_tooltip.cpp
-modules/gui/skins2/win32/win32_tooltip.h
-modules/gui/skins2/win32/win32_window.cpp
-modules/gui/skins2/win32/win32_window.h
-modules/gui/skins2/x11/x11_display.cpp
-modules/gui/skins2/x11/x11_display.h
-modules/gui/skins2/x11/x11_factory.cpp
-modules/gui/skins2/x11/x11_factory.h
-modules/gui/skins2/x11/x11_graphics.cpp
-modules/gui/skins2/x11/x11_graphics.h
-modules/gui/skins2/x11/x11_loop.cpp
-modules/gui/skins2/x11/x11_loop.h
-modules/gui/skins2/x11/x11_timer.cpp
-modules/gui/skins2/x11/x11_timer.h
-modules/gui/skins2/x11/x11_tooltip.cpp
-modules/gui/skins2/x11/x11_tooltip.h
-modules/gui/skins2/x11/x11_window.cpp
-modules/gui/skins2/x11/x11_window.h
-modules/gui/wxwindows/control.cpp
 modules/gui/wxwindows/dialogs.cpp
 modules/gui/wxwindows/fileinfo.cpp
 modules/gui/wxwindows/interface.cpp

src/input/input_clock.c

@@ -2,7 +2,7 @@
  * input_clock.c: Clock/System date convertions, stream management
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_clock.c,v 1.43 2003/11/29 18:36:13 massiot Exp $
+ * $Id: input_clock.c,v 1.44 2003/12/04 16:49:45 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -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
@@ -91,7 +91,7 @@ static mtime_t ClockToSysdate( input_thread_t * p_input,
 
     if( p_pgrm->i_synchro_state == SYNCHRO_OK )
     {
-        i_sysdate = (mtime_t)(i_clock - p_pgrm->cr_ref) 
+        i_sysdate = (mtime_t)(i_clock - p_pgrm->cr_ref)
                         * (mtime_t)p_input->stream.control.i_rate
                         * (mtime_t)300;
         i_sysdate /= 27;

src/libvlc.c

@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.104 2003/11/25 12:35:15 sam Exp $
+ * $Id: libvlc.c,v 1.105 2003/12/04 16:49:45 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1486,7 +1486,7 @@ static void Version( void )
       _("This program comes with NO WARRANTY, to the extent permitted by "
         "law.\nYou may redistribute it under the terms of the GNU General "
         "Public License;\nsee the file named COPYING for details.\n"
-        "Written by the VideoLAN team; see AUTHORS file.\n") );
+        "Written by the VideoLAN team; see the AUTHORS file.\n") );
 
 #ifdef WIN32        /* Pause the console because it's destroyed when we exit */
     fprintf( stdout, _("\nPress the RETURN key to continue...\n") );

src/libvlc.h

@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.111 2003/11/30 16:00:23 fenrir Exp $
+ * $Id: libvlc.h,v 1.112 2003/12/04 16:49:45 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -98,7 +98,7 @@ static char *ppsz_language_text[] =
 #define AOUT_CAT_LONGTEXT N_( \
     "These options allow you to tune VLC's audio subsystem, " \
     "and to add audio filters which can be used for " \
-    "postprocessing or visual effects (spectrum analyser,...).\n" \
+    "postprocessing or visual effects (spectrum analyzer, ...).\n" \
     "To tune these filters, have a look at the \"audio filter\" " \
     "plugin options.")
 
@@ -436,7 +436,7 @@ static char *ppsz_language_text[] =
     "advantage of them.")
 
 #define PLAYLIST_CAT_LONGTEXT N_( \
-     "These options define the behaviour of the playlist. Some " \
+     "These options define the behavior of the playlist. Some " \
      "of them can be overriden in the playlist dialog box." )
 
 #define RANDOM_TEXT N_("Play files randomly forever")