From 1954049294be0f83166c20d1bbff7faf14f2ed57 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Fri, 16 Jul 2004 11:29:21 +0000 Subject: [PATCH] * it's information, not informations (grep -r) * modules/demux/avi/avi.c: Look a bit further into the file for the avi tag. this allows you to play avi in uncompressed .rar (only first part of course). --- modules/access/mms/mmstu.h | 2 +- modules/control/http.c | 4 ++-- modules/demux/asf/asf.c | 2 +- modules/demux/avi/avi.c | 21 +++++++++++++++++---- modules/demux/mkv.cpp | 14 +++++++------- modules/demux/mp4/mp4.c | 2 +- modules/misc/sap.c | 4 ++-- modules/mux/asf.c | 2 +- modules/video_output/fb.c | 14 +++++++------- modules/video_output/ggi.c | 4 ++-- modules/video_output/x11/xcommon.c | 6 +++--- share/http/info.html | 4 ++-- src/input/input.c | 4 ++-- 13 files changed, 48 insertions(+), 35 deletions(-) diff --git a/modules/access/mms/mmstu.h b/modules/access/mms/mmstu.h index 2e744bcd0c..f41ae1bbfb 100644 --- a/modules/access/mms/mmstu.h +++ b/modules/access/mms/mmstu.h @@ -69,7 +69,7 @@ struct access_sys_t size_t i_media; size_t i_media_used; - /* extracted informations */ + /* extracted information */ int i_command; /* from 0x01 answer (not yet set) */ diff --git a/modules/control/http.c b/modules/control/http.c index b4eb2d952c..d7aec7ec54 100644 --- a/modules/control/http.c +++ b/modules/control/http.c @@ -2360,7 +2360,7 @@ static void Execute( httpd_file_sys_t *p_args, { index = mvar_PlaylistSetNew( m.param1, p_intf->p_sys->p_playlist ); } - else if( !strcmp( m.param2, "informations" ) ) + else if( !strcmp( m.param2, "information" ) ) { index = mvar_InfoSetNew( m.param1, p_intf->p_sys->p_input ); } @@ -3102,7 +3102,7 @@ static char *Find_end_MRL( char *psz ) /********************************************************************** * parse_MRL: parse the MRL, find the mrl string and the options, - * create an item with all informations in it, and return the item. + * create an item with all information in it, and return the item. * return NULL if there is an error. **********************************************************************/ playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz ) diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c index 9dc9a328bf..8be2f3c347 100644 --- a/modules/demux/asf/asf.c +++ b/modules/demux/asf/asf.c @@ -748,7 +748,7 @@ static int DemuxInit( demux_t *p_demux ) } } - /* Create meta informations */ + /* Create meta information */ p_sys->meta = vlc_meta_New(); if( ( p_cd = ASF_FindObject( p_sys->p_root->p_hdr, diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 695ff7d625..ecdf17d89f 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -200,18 +200,26 @@ static int Open( vlc_object_t * p_this ) avi_chunk_avih_t *p_avih; unsigned int i_track; - unsigned int i; + unsigned int i, i_peeker; uint8_t *p_peek; /* Is it an avi file ? */ - if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) + if( stream_Peek( p_demux->s, &p_peek, 200 ) < 200 ) { msg_Err( p_demux, "cannot peek()" ); return VLC_EGENERIC; } - if( strncmp( &p_peek[0], "RIFF", 4 ) || strncmp( &p_peek[8], "AVI ", 4 ) ) + for( i_peeker = 0; i_peeker < 188; i_peeker++ ) + { + if( !strncmp( &p_peek[0], "RIFF", 4 ) && !strncmp( &p_peek[8], "AVI ", 4 ) ) + { + break; + } + p_peek++; + } + if( i_peeker == 188 ) { msg_Warn( p_demux, "avi module discarded (invalid header)" ); return VLC_EGENERIC; @@ -238,6 +246,11 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_demux = Demux_UnSeekable; } + if( i_peeker > 0 ) + { + stream_Read( p_demux->s, NULL, i_peeker ); + } + if( AVI_ChunkReadRoot( p_demux->s, &p_sys->ck_root ) ) { msg_Err( p_demux, "avi module discarded (invalid file)" ); @@ -292,7 +305,7 @@ static int Open( vlc_object_t * p_this ) goto error; } - /* print informations on streams */ + /* print information on streams */ msg_Dbg( p_demux, "AVIH: %d stream, flags %s%s%s%s ", i_track, p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"", diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index af4f4a91e6..ab2011ce6d 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -260,7 +260,7 @@ struct demux_sys_t static void IndexAppendCluster ( demux_t *p_demux, KaxCluster *cluster ); static char *UTF8ToStr ( const UTFstring &u ); static void LoadCues ( demux_t * ); -static void InformationsCreate ( demux_t * ); +static void InformationCreate ( demux_t * ); static void ParseInfo( demux_t *, EbmlElement *info ); static void ParseTracks( demux_t *, EbmlElement *tracks ); @@ -624,8 +624,8 @@ static int Open( vlc_object_t * p_this ) #undef tk } - /* add informations */ - InformationsCreate( p_demux ); + /* add information */ + InformationCreate( p_demux ); return VLC_SUCCESS; @@ -1419,7 +1419,7 @@ EbmlElement *EbmlParser::Get( void ) * * * LoadTags : load ... the tags element * - * * InformationsCreate : create all informations, load tags if present + * * InformationCreate : create all information, load tags if present * *****************************************************************************/ static void LoadCues( demux_t *p_demux ) @@ -2109,7 +2109,7 @@ static void ParseInfo( demux_t *p_demux, EbmlElement *info ) unsigned int i; int i_upper_level = 0; - msg_Dbg( p_demux, "| + Informations" ); + msg_Dbg( p_demux, "| + Information" ); /* Master elements */ m = static_cast(info); @@ -2342,9 +2342,9 @@ static void ParseChapters( demux_t *p_demux, EbmlElement *chapters ) } /***************************************************************************** - * InformationsCreate: + * InformationCreate: *****************************************************************************/ -static void InformationsCreate( demux_t *p_demux ) +static void InformationCreate( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; int i_track; diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 6124621593..cb2955cbaa 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -433,7 +433,7 @@ static int Open( vlc_object_t * p_this ) p_sys->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) ); memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) ); - /* now process each track and extract all usefull informations */ + /* now process each track and extract all usefull information */ for( i = 0; i < p_sys->i_tracks; i++ ) { p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i ); diff --git a/modules/misc/sap.c b/modules/misc/sap.c index 84bf268759..47fa72e2d5 100644 --- a/modules/misc/sap.c +++ b/modules/misc/sap.c @@ -146,7 +146,7 @@ static void free_sd( sess_descr_t * ); /* Detect multicast addresses */ static int ismult( char * ); -/* The struct that contains sdp informations */ +/* The struct that contains sdp information */ struct sess_descr_t { int i_version; @@ -160,7 +160,7 @@ struct sess_descr_t attr_descr_t **pp_attributes; }; -/* All this informations are not useful yet. */ +/* All this information is not useful yet. */ struct media_descr_t { char *psz_medianame; diff --git a/modules/mux/asf.c b/modules/mux/asf.c index eda83ccc0d..ad1c796ef6 100644 --- a/modules/mux/asf.c +++ b/modules/mux/asf.c @@ -100,7 +100,7 @@ typedef struct int i_id; int i_cat; - /* codec informations */ + /* codec information */ uint16_t i_tag; /* for audio */ vlc_fourcc_t i_fourcc; /* for video */ char *psz_name; /* codec name */ diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index 91a1da50a0..b21fdfc4c5 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -2,7 +2,7 @@ * fb.c : framebuffer plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: fb.c,v 1.9 2004/03/02 13:53:14 kuehne Exp $ + * $Id$ * * Authors: Samuel Hocevar * @@ -85,19 +85,19 @@ vlc_module_end(); *****************************************************************************/ struct vout_sys_t { - /* System informations */ + /* System information */ int i_tty; /* tty device handle */ struct termios old_termios; - /* Original configuration informations */ + /* Original configuration information */ struct sigaction sig_usr1; /* USR1 previous handler */ struct sigaction sig_usr2; /* USR2 previous handler */ struct vt_mode vt_mode; /* previous VT mode */ /* Framebuffer information */ int i_fd; /* device handle */ - struct fb_var_screeninfo old_info; /* original mode informations */ - struct fb_var_screeninfo var_info; /* current mode informations */ + struct fb_var_screeninfo old_info; /* original mode information */ + struct fb_var_screeninfo var_info; /* current mode information */ vlc_bool_t b_pan; /* does device supports panning ? */ struct fb_cmap fb_cmap; /* original colormap */ uint16_t *p_palette; /* original palette */ @@ -482,7 +482,7 @@ static int OpenDisplay( vout_thread_t *p_vout ) } free( psz_device ); - /* Get framebuffer device informations */ + /* Get framebuffer device information */ if( ioctl( p_vout->p_sys->i_fd, FBIOGET_VSCREENINFO, &p_vout->p_sys->var_info ) ) { @@ -507,7 +507,7 @@ static int OpenDisplay( vout_thread_t *p_vout ) return VLC_EGENERIC; } - /* Get some informations again, in the definitive configuration */ + /* Get some information again, in the definitive configuration */ if( ioctl( p_vout->p_sys->i_fd, FBIOGET_FSCREENINFO, &fix_info ) || ioctl( p_vout->p_sys->i_fd, FBIOGET_VSCREENINFO, &p_vout->p_sys->var_info ) ) diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c index afbe252367..b17087a5d2 100644 --- a/modules/video_output/ggi.c +++ b/modules/video_output/ggi.c @@ -2,7 +2,7 @@ * ggi.c : GGI plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: ggi.c,v 1.6 2004/01/26 16:45:02 zorglub Exp $ + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -74,7 +74,7 @@ vlc_module_end(); *****************************************************************************/ struct vout_sys_t { - /* GGI system informations */ + /* GGI system information */ ggi_visual_t p_display; /* display device */ ggi_mode mode; /* mode descriptor */ diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index 9d23a01a17..6055ec0ee4 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -1402,7 +1402,7 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) #define SCREEN p_vout->p_sys->p_win->i_screen - /* Get Informations about Xinerama (num of screens) */ + /* Get Information about Xinerama (num of screens) */ screens = XineramaQueryScreens( p_vout->p_sys->p_display, &i_num_screens ); @@ -1516,7 +1516,7 @@ static void DisableXScreenSaver( vout_thread_t *p_vout ) int dummy; #endif - /* Save screen saver informations */ + /* Save screen saver information */ XGetScreenSaver( p_vout->p_sys->p_display, &p_vout->p_sys->i_ss_timeout, &p_vout->p_sys->i_ss_interval, &p_vout->p_sys->i_ss_blanking, @@ -1798,7 +1798,7 @@ static int InitDisplay( vout_thread_t *p_vout ) { #ifdef MODULE_NAME_IS_x11 XPixmapFormatValues * p_formats; /* pixmap formats */ - XVisualInfo * p_xvisual; /* visuals informations */ + XVisualInfo * p_xvisual; /* visuals information */ XVisualInfo xvisual_template; /* visual template */ int i_count; /* array size */ #endif diff --git a/share/http/info.html b/share/http/info.html index e707eaea83..5031548553 100644 --- a/share/http/info.html +++ b/share/http/info.html @@ -1,11 +1,11 @@ - VLC media player - Informations + VLC media player - Information

VLC media player

- +

    diff --git a/src/input/input.c b/src/input/input.c index 230abbae82..3cd6b71322 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -767,7 +767,7 @@ static int Init( input_thread_t * p_input ) if( p_meta && p_meta->i_meta > 0 ) { - msg_Dbg( p_input, "meta informations:" ); + msg_Dbg( p_input, "meta information:" ); for( i = 0; i < p_meta->i_meta; i++ ) { msg_Dbg( p_input, " - '%s' = '%s'", @@ -780,7 +780,7 @@ static int Init( input_thread_t * p_input ) input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Author"), p_meta->value[i] ); - input_Control( p_input, INPUT_ADD_INFO, _("Meta-informations"), + input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"), _(p_meta->name[i]), "%s", p_meta->value[i] ); }