* A few string and organization fixes in preferences

* Update the LIST
* Coding style fixes

diff --git a/modules/LIST b/modules/LIST
index 120c26b9aa68e1f2d96d87400404f6d014609305..34ed3a5043f9c7ab55e07ada6548b2f5b9a4a06a 100644 (file)
--- a/modules/LIST
+++ b/modules/LIST
@@ -1,4 +1,4 @@
-List of vlc plugins (221)
+List of vlc plugins (264)
 $Id$
 
  * a52: A/52 basic parser/packetizer
@@ -31,6 +31,8 @@ $Id$
 
  * access_output_udp: UDP Network access_output module
 
+ * access_smb: SMB shares access module
+
  * access_tcp: TCP Network access module
 
  * access_udp: UDP Network access module 
@@ -57,6 +59,8 @@ $Id$
  
  * au: AU file demuxer
 
+ * audio_format: helper module for audio transcoding
+
  * avi: AVI File stream demuxer
 
  * bandlimited_resampler: Bandlimited interpolation audio resampler
@@ -87,11 +91,13 @@ $Id$
  
  * cvdsub: CVD subtitles decoder
 
+ * daap: iTunes shares services discovery
+
  * deinterlace: naive deinterlacing filter.
 
  * demuxdump: Pseudo-demuxer that dumps the stream
-
- * demuxstream: MPEG TS demuxer which also sends the stream to the network
+ 
+ * dirac: BBC Dirac codec
 
  * directory : input module to read files in a directory
 
@@ -137,6 +143,8 @@ $Id$
 
  * ffmpeg: Video decoder using the ffmpeg library
 
+ * ffmpegaltivec: Video decoder using the ffmpeg library (Altivec version)
+
  * fixed32tofloat32: Audio converter from fixed 32 bits to float 32 bits
 
  * fixed32tos16: Fixed 32 bits to Signed 16 bits integer audio converter
@@ -161,6 +169,8 @@ $Id$
 
  * galaktos: a visualization module that outputs OpenGL
 
+ * gapi: PocketPC Video output
+
  * gestures: mouse gestures control plugin
 
  * ggi: video output module using the GGI API.
@@ -179,6 +189,8 @@ $Id$
  
  * gnome_main: Gtk+ wrapper for gtk_main
 
+ * gnutls: GNU TLS encryption/decryption module
+
  * goom: visualisation plugin based on goom
 
  * gtk2: interface using the Gtk2 widget set.
@@ -190,6 +202,8 @@ $Id$
  * gtk_main: Gtk+ wrapper for gtk_main
 
  * h264: H264 decoder
+ 
+ * hal: Linux HAL services discovery module
 
  * hd1000a: audio output module for the Roku HD1000 Set-Top-Box
 
@@ -223,6 +237,8 @@ $Id$
  * id3: ID3 tag skipper
  
  * id3tag: ID3 tag parser/skipper using libid3tag
+
+ * image: Image file video output
  
  * invert: inverse video filter.
 
@@ -250,10 +266,14 @@ $Id$
  
  * m3u: PLS, M3U, ASX and B4S playlist parser
 
+ * m4a: MPEG-4 Audio Stream demuxer
+
  * m4v: MPEG-4 Video Stream demuxer
 
  * macosx: Video output, and interface module for Mac OS X.
 
+ * marq: Overlays a marquee on the video
+
  * mash: OpenMash based decoder
 
  * memcpy3dn: 3D Now! accelerated version of memcpy.
@@ -276,6 +296,8 @@ $Id$
 
  * motionblur: Motion blur filter
 
+ * motiondetect: Motion detection filter
+
  * mp4: MP4 file input module
 
  * mpeg_audio: MPEG audio parser/packetizer
@@ -335,14 +357,10 @@ $Id$
  * pda: interface for iPaq using the Gtk2+ widget set.
 
  * playlist: playlist import module
- 
- * portaudio: audio output module that uses the portaudio library (www.portaudio.com)
 
- * postprocessing_c: Video Postprocessing module
-
- * postprocessing_mmx: Video Postprocessing module using MMX
+ * png: PNG images decoder
  
- * postprocessing_mmxext: Video Postprocessing module using MMX_EXT 
+ * portaudio: audio output module that uses the portaudio library (www.portaudio.com)
 
  * ps: input module for MPEG PS decapsulation.
  
@@ -368,6 +386,8 @@ $Id$
 
  * real: partial Real audio/video demuxer
 
+ * rtci: extended RC interface module
+
  * s16tofixed32: Signed 16 bits to fixed 32 bits audio converter
 
  * s16tofloat32: Signed 16 bits to float 32 bits audio converter
@@ -380,11 +400,17 @@ $Id$
 
  * satellite: Satellite cards access module
 
+ * scale: Images rescaler
+
  * screen: a input module that takes screenshots of the primary monitor
 
  * screensaver: screensaver disabling module
 
  * sgimb: SGIMB referrer files parser
+ 
+ * showintf: shows the main interface
+
+ * simple_channel_mixer: channel mixer
 
  * skins2: Skinnable interface, new generation
 
@@ -398,6 +424,8 @@ $Id$
 
  * spudec: RLE DVD subtitles decoder.
 
+ * stream_out_description: helper module for RTSP vod
+
  * stream_out_display: displays a stream output chain 
 
  * stream_out_dummy: dummy stream out chain module
@@ -426,6 +454,8 @@ $Id$
 
  * svgalib: SGVAlib output plugin
 
+ * swscale: Image scaling module
+
  * tarkin: a tarkin video decoder using libtarkin
 
  * telnet: Telnet control interface for VideoLAN Media Manager
@@ -440,6 +470,8 @@ $Id$
 
  * theora: a theora video decoder/packetizer/encoder using the libtheora library.
 
+ * time: Overlays the current time
+
  * toolame: a mp1 mp2 audio encoder based on toolame
 
  * transform: filter for horizontal and vertical image flips and
@@ -469,6 +501,10 @@ $Id$
 
  * visual: visualisation system
 
+ * vobsub: VobSUB subtitles demuxer
+
+ * vod_rtsp: RTSP VoD module
+
  * vorbis: a vorbis audio decoder/packetizer using the libvorbis library.
 
  * vout_directx: video output module using the DirectX API.
@@ -481,6 +517,8 @@ $Id$
 
  * waveout: simple audio output module for Windows.
 
+ * wince: Pocket PC interface
+
  * wingdi: WIN 32 / WIN CE GDI video output
 
  * wxwindows: interface module using the cross-platform wxWindows library.
@@ -489,8 +527,12 @@ $Id$
 
  * x264: H264 video decoder using X264
 
+ * xml: LibXML xml parser
+
  * xosd: X On Screen Display interface
 
+ * xtag: XTAG xml parser
+
  * xvid: Decoder for the Xvid codec, using libxvidcore
 
  * xvideo: video output module using the XVideo API.

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index 78e131f4f8c364f78b36574fe106e933bf074141..e6e2f7178023dc3e40c58b72648ac4f3bb9221bc 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -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
@@ -80,7 +80,7 @@ struct intf_sys_t
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static int  Open    ( vlc_object_t * );                  
+static int  Open    ( vlc_object_t * );
 static void Close   ( vlc_object_t * );
 static void Run     ( intf_thread_t * );
 
@@ -100,7 +100,8 @@ static char *mode_list_text[] = { N_("Text"), "HTML" };
 vlc_module_begin();
     set_category( CAT_ADVANCED );
     set_subcategory( SUBCAT_ADVANCED_MISC );
-    set_description( _("File logging interface") );
+    set_shortname( N_( "Logging" ) );
+    set_description( _("File logging") );
 
     add_file( "logfile", NULL, NULL, N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );
     add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,

diff --git a/src/libvlc.h b/src/libvlc.h
index 597ab2a207be53cb9beae56be1ce83f53e291b57..bd8899cc4eb7be696d1e472a3a8f684671c29816 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -288,7 +288,7 @@ static char *ppsz_align_descriptions[] =
     "When using the PVR input (or a very irregular source), you should " \
     "set this to 10000.")
 
-#define SERVER_PORT_TEXT N_("Server port")
+#define SERVER_PORT_TEXT N_("UDP port")
 #define SERVER_PORT_LONGTEXT N_( \
     "This is the port used for UDP streams. By default, we chose 1234.")
 
@@ -310,25 +310,30 @@ static char *ppsz_align_descriptions[] =
 
 #define INPUT_PROGRAM_TEXT N_("Choose program (SID)")
 #define INPUT_PROGRAM_LONGTEXT N_( \
-    "Choose the program to select by giving its Service ID.")
+    "Choose the program to select by giving its Service ID\n." \
+    "Only use this option if you want to read a multi-program stream " \
+    "(like DVB streams for example )" )
 
 #define INPUT_PROGRAMS_TEXT N_("Choose programs")
 #define INPUT_PROGRAMS_LONGTEXT N_( \
     "Choose the programs to select by giving a comma-separated list of " \
-    "SIDs.")
+    "SIDs\n." \
+    "Only use this option if you want to read a multi-program stream " \
+    "(like DVB streams for example )" )
 
 #define INPUT_CHAN_TEXT N_("Choose audio channel")
 #define INPUT_CHAN_LONGTEXT N_( \
-    "Give the stream number of the audio channel you want to use in a DVD " \
+    "Give the stream number of the audio channel you want to use" \
     "(from 0 to n).")
 
-#define INPUT_SUB_TEXT N_("Choose subtitle track")
+#define INPUT_SUB_TEXT N_("Choose subtitles track")
 #define INPUT_SUB_LONGTEXT N_( \
     "Give the stream number of the subtitle channel you want to use " \
     "(from 0 to n).")
 
 #define INPUT_REPEAT_TEXT N_("Input repetitions")
-#define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be repeated")
+#define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be " \
+                                 "repeated")
 
 #define START_TIME_TEXT N_("Input start time (seconds)")
 #define START_TIME_LONGTEXT N_("Input start time (seconds)")
@@ -337,11 +342,12 @@ static char *ppsz_align_descriptions[] =
 #define STOP_TIME_LONGTEXT N_("Input stop time (seconds)")
 
 #define INPUT_LIST_TEXT N_("Input list")
-#define INPUT_LIST_LONGTEXT N_("Allows you to specify a coma separated list " \
-    "of inputs that will be concatenated to the main MRL when playing.")
+#define INPUT_LIST_LONGTEXT N_("Allows you to specify a comma-separated list " \
+    "of inputs that will be concatenated.")
 
 #define INPUT_SLAVE_TEXT N_("Input slave (experimental)")
-#define INPUT_SLAVE_LONGTEXT N_("Input slave (experimental)")
+#define INPUT_SLAVE_LONGTEXT N_("Allows you to play from several files at " \
+    "the same time. Experimental, not all formats are supported.")
 
 #define BOOKMARKS_TEXT N_("Bookmarks list for a stream")
 #define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \
@@ -963,14 +969,8 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_ACODEC );
     set_subcategory( SUBCAT_INPUT_SCODEC );
     set_subcategory( SUBCAT_INPUT_ADVANCED );
-    add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
-                 CR_AVERAGE_LONGTEXT, VLC_FALSE );
-    add_integer( "server-port", 1234, NULL,
-                 SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
-    add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
-    add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT,
-                IFACE_ADDR_LONGTEXT, VLC_TRUE );
 
+    set_section( N_( "Tracks settings" ), NULL );
     add_integer( "program", 0, NULL,
                  INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
     add_string( "programs", "", NULL,
@@ -979,6 +979,8 @@ vlc_module_begin();
                  INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE );
     add_integer( "spu-channel", -1, NULL,
                  INPUT_SUB_TEXT, INPUT_SUB_LONGTEXT, VLC_FALSE );
+
+    set_section( N_( "Playback control" ) , NULL);
     add_integer( "input-repeat", 0, NULL,
                  INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_TRUE );
     add_integer( "start-time", 0, NULL,
@@ -1002,6 +1004,13 @@ vlc_module_begin();
     add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT,
               CDAUDIO_DEV_LONGTEXT, VLC_FALSE );
 
+    set_section( N_( "Network settings" ), NULL );
+
+    add_integer( "server-port", 1234, NULL,
+                 SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
+    add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
+    add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT,
+                IFACE_ADDR_LONGTEXT, VLC_TRUE );
     add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE );
         change_short('6');
     add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE );
@@ -1034,6 +1043,11 @@ vlc_module_begin();
     add_string( "meta-url", NULL, NULL, META_URL_TEXT,
                 META_URL_LONGTEXT, VLC_TRUE );
 
+    set_section( N_( "Advanced" ), NULL );
+
+    add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
+                 CR_AVERAGE_LONGTEXT, VLC_FALSE );
+
     /* Decoder options */
     add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE );
     add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT,

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 87d13a169c5535b1a6e24435d99311d86f7b1f19..d8c35e1599656d077122998e0f2d216c8699abae 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -454,7 +454,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
         /* Load the blending module */
         if( !p_spu->p_blend && p_region )
         {
-            p_spu->p_blend = vlc_object_create( p_spu, sizeof(filter_t) );
+            p_spu->p_blend = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
             vlc_object_attach( p_spu->p_blend, p_spu );
             p_spu->p_blend->fmt_out.video.i_x_offset =
                 p_spu->p_blend->fmt_out.video.i_y_offset = 0;
@@ -470,7 +470,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
         /* Load the text rendering module */
         if( !p_spu->p_text && p_region )
         {
-            p_spu->p_text = vlc_object_create( p_spu, sizeof(filter_t) );
+            p_spu->p_text = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
             vlc_object_attach( p_spu->p_text, p_spu );
 
             p_spu->p_text->fmt_out.video.i_width =
@@ -604,11 +604,13 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
                     p_region->p_cache = 0;
                 }
             }
+
             if( (i_scale_width != 1000 || i_scale_height != 1000) &&
                 p_spu->p_scale && !p_region->p_cache )
             {
                 picture_t *p_pic;
 
+
                 p_spu->p_scale->fmt_in.video = p_region->fmt;
                 p_spu->p_scale->fmt_out.video = p_region->fmt;
 
@@ -695,10 +697,10 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
             if( p_spu->b_force_crop )
             {
                 video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
-               int i_crop_x = p_spu->i_crop_x * i_scale_width / 1000;
-               int i_crop_y = p_spu->i_crop_y * i_scale_height / 1000;
-               int i_crop_width = p_spu->i_crop_width * i_scale_width / 1000;
-               int i_crop_height = p_spu->i_crop_height * i_scale_height/1000;
+                int i_crop_x = p_spu->i_crop_x * i_scale_width / 1000;
+                int i_crop_y = p_spu->i_crop_y * i_scale_height / 1000;
+                int i_crop_width = p_spu->i_crop_width * i_scale_width / 1000;
+                int i_crop_height = p_spu->i_crop_height * i_scale_height/1000;
 
                 /* Find the intersection */
                 if( i_crop_x + i_crop_width <= i_x_offset ||