Changeset 44d19ee25ed4d1a8e0764ca075a72ed390093aa3

Timestamp:

01/29/05 16:22:53 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1107012173 +0000

git-parent:

[6f9ffd3f34ac93fb9f234fe7e6f6cf11149ef89e]

git-author:

Clément Stenac <zorglub@videolan.org> 1107012173 +0000

Message:

* A few string and organization fixes in preferences
* Update the LIST
* Coding style fixes

Files:

• modules/LIST (modified) (21 diffs)
• modules/misc/logger.c (modified) (3 diffs)
• src/libvlc.h (modified) (8 diffs)
• src/video_output/vout_subpictures.c (modified) (4 diffs)

modules/LIST

@@ -1 @@
-21
+64
-$Id$
-
@@ -32 +32 @@
- * access_output_udp: UDP Network access_output module
-
+ * access_smb: SMB shares access module
+
- * access_tcp: TCP Network access module
-
@@ -58 +60 @@
- * au: AU file demuxer
-
+ * audio_format: helper module for audio transcoding
+
- * avi: AVI File stream demuxer
-
@@ -88 +92 @@
- * cvdsub: CVD subtitles decoder
-
+ * daap: iTunes shares services discovery
+
- * deinterlace: naive deinterlacing filter.
-
- * demuxdump: Pseudo-demuxer that dumps the stream
-
-emuxstream: MPEG TS demuxer which also sends the stream to the network
+
+irac: BBC Dirac codec
-
- * directory : input module to read files in a directory
@@ -138 +144 @@
- * 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
-
@@ -162 +170 @@
- * galaktos: a visualization module that outputs OpenGL
-
+ * gapi: PocketPC Video output
+
- * gestures: mouse gestures control plugin
-
@@ -180 +190 @@
- * gnome_main: Gtk+ wrapper for gtk_main
-
+ * gnutls: GNU TLS encryption/decryption module
+
- * goom: visualisation plugin based on goom
-
@@ -191 +203 @@
-
- * h264: H264 decoder
+ 
+ * hal: Linux HAL services discovery module
-
- * hd1000a: audio output module for the Roku HD1000 Set-Top-Box
@@ -224 +238 @@
- 
- * id3tag: ID3 tag parser/skipper using libid3tag
+
+ * image: Image file video output
- 
- * invert: inverse video filter.
@@ -251 +267 @@
- * 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
-
@@ -277 +297 @@
- * motionblur: Motion blur filter
-
+ * motiondetect: Motion detection filter
+
- * mp4: MP4 file input module
-
@@ -336 +358 @@
-
- * playlist: playlist import module
+
+ * png: PNG images decoder
- 
- * portaudio: audio output module that uses the portaudio library (www.portaudio.com)
-
- * postprocessing_c: Video Postprocessing module
-
- * postprocessing_mmx: Video Postprocessing module using MMX
- 
- * postprocessing_mmxext: Video Postprocessing module using MMX_EXT 
-
- * ps: input module for MPEG PS decapsulation.
- 
@@ -369 +387 @@
- * real: partial Real audio/video demuxer
-
+ * rtci: extended RC interface module
+
- * s16tofixed32: Signed 16 bits to fixed 32 bits audio converter
-
@@ -381 +401 @@
- * satellite: Satellite cards access module
-
+ * scale: Images rescaler
+
- * screen: a input module that takes screenshots of the primary monitor
-
@@ -386 +408 @@
-
- * sgimb: SGIMB referrer files parser
+ 
+ * showintf: shows the main interface
+
+ * simple_channel_mixer: channel mixer
-
- * skins2: Skinnable interface, new generation
@@ -399 +425 @@
- * spudec: RLE DVD subtitles decoder.
-
+ * stream_out_description: helper module for RTSP vod
+
- * stream_out_display: displays a stream output chain 
-
@@ -427 +455 @@
- * svgalib: SGVAlib output plugin
-
+ * swscale: Image scaling module
+
- * tarkin: a tarkin video decoder using libtarkin
-
@@ -440 +470 @@
-
- * 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
@@ -470 +502 @@
- * visual: visualisation system
-
+ * vobsub: VobSUB subtitles demuxer
+
+ * vod_rtsp: RTSP VoD module
+
- * vorbis: a vorbis audio decoder/packetizer using the libvorbis library.
-
@@ -482 +518 @@
- * waveout: simple audio output module for Windows.
-
+ * wince: Pocket PC interface
+
- * wingdi: WIN 32 / WIN CE GDI video output
-
@@ -490 +528 @@
- * 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
-

modules/misc/logger.c

@@ -11 +11 @@
- * 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
@@ -81 +81 @@
- * Local prototypes
- *****************************************************************************/
-                  
+
-static void Close   ( vlc_object_t * );
-static void Run     ( intf_thread_t * );
@@ -101 +101 @@
-    set_category( CAT_ADVANCED );
-    set_subcategory( SUBCAT_ADVANCED_MISC );
-
+
+
-
-    add_file( "logfile", NULL, NULL, N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );

src/libvlc.h

@@ -289 +289 @@
-    "set this to 10000.")
-
-Server
+UDP
-#define SERVER_PORT_LONGTEXT N_( \
-    "This is the port used for UDP streams. By default, we chose 1234.")
@@ -311 +311 @@
-#define INPUT_PROGRAM_TEXT N_("Choose program (SID)")
-#define INPUT_PROGRAM_LONGTEXT N_( \
-
+
+
+
-
-#define INPUT_PROGRAMS_TEXT N_("Choose programs")
-#define INPUT_PROGRAMS_LONGTEXT N_( \
-    "Choose the programs to select by giving a comma-separated list of " \
-
+
+
+
-
-#define INPUT_CHAN_TEXT N_("Choose audio channel")
-#define INPUT_CHAN_LONGTEXT N_( \
- in a DVD 
+
-    "(from 0 to n).")
-
-
+s
-#define INPUT_SUB_LONGTEXT N_( \
-    "Give the stream number of the subtitle channel you want to use " \
@@ -329 +333 @@
-
-#define INPUT_REPEAT_TEXT N_("Input repetitions")
-
+
+
-
-#define START_TIME_TEXT N_("Input start time (seconds)")
@@ -338 +343 @@
-
-#define INPUT_LIST_TEXT N_("Input list")
-a 
- to the main MRL when playing
+ma-
+
-
-#define INPUT_SLAVE_TEXT N_("Input slave (experimental)")
-
+
+
-
-#define BOOKMARKS_TEXT N_("Bookmarks list for a stream")
@@ -964 +970 @@
-    set_subcategory( SUBCAT_INPUT_SCODEC );
-    set_subcategory( SUBCAT_INPUT_ADVANCED );
-
-
-
-
-
-
-
-
+
+
-    add_integer( "program", 0, NULL,
-                 INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE );
@@ -980 +980 @@
-    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 );
@@ -1003 +1005 @@
-              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');
@@ -1034 +1043 @@
-    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 */

src/video_output/vout_subpictures.c

@@ -455 +455 @@
-        if( !p_spu->p_blend && p_region )
-        {
-sizeof(filter_t)
+VLC_OBJECT_FILTER
-            vlc_object_attach( p_spu->p_blend, p_spu );
-            p_spu->p_blend->fmt_out.video.i_x_offset =
@@ -471 +471 @@
-        if( !p_spu->p_text && p_region )
-        {
-sizeof(filter_t)
+VLC_OBJECT_FILTER
-            vlc_object_attach( p_spu->p_text, p_spu );
-
@@ -605 +605 @@
-                }
-            }
+
-            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;
@@ -696 +698 @@
-            {
-                video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
-       
-       
-       
-       
+                
+                
+                
+                
-
-                /* Find the intersection */