From 4d85871d1b29265a6cc5744677f0f0bb9bfac20f Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Wed, 28 Jul 2010 21:03:32 +0200 Subject: [PATCH] s/informations/information/ --- bindings/mediacontrol/mediacontrol_structures.h | 2 +- include/vlc_fourcc.h | 2 +- include/vlc_input_item.h | 6 +++--- include/vlc_picture.h | 2 +- include/vlc_vout_display.h | 4 ++-- modules/access/cdda.c | 8 ++++---- modules/access/sftp.c | 4 ++-- modules/access/zip/zipaccess.c | 2 +- modules/codec/avcodec/audio.c | 2 +- modules/demux/ts.c | 2 +- modules/gui/qt4/components/playlist/playlist.cpp | 2 +- modules/gui/qt4/dialogs/vlm.cpp | 4 ++-- modules/meta_engine/taglib.cpp | 10 +++++----- modules/packetizer/copy.c | 2 +- modules/stream_out/smem.c | 2 +- src/control/video.c | 2 +- src/input/es_out.c | 2 +- src/interface/dialog.c | 2 +- src/text/filesystem.c | 4 ++-- src/video_output/vout_pictures.c | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bindings/mediacontrol/mediacontrol_structures.h b/bindings/mediacontrol/mediacontrol_structures.h index 6a37482766..810ce3cdc5 100644 --- a/bindings/mediacontrol/mediacontrol_structures.h +++ b/bindings/mediacontrol/mediacontrol_structures.h @@ -125,7 +125,7 @@ typedef struct { /** * Stream information - * This structure allows to quickly get various informations about the stream. + * This structure allows to quickly get various information about the stream. */ typedef struct { mediacontrol_PlayerStatus streamstatus; diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index b1f349e119..fd7d24a861 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -403,7 +403,7 @@ VLC_EXPORT( bool, vlc_fourcc_IsYUV, ( vlc_fourcc_t ) ); VLC_EXPORT( bool, vlc_fourcc_AreUVPlanesSwapped, (vlc_fourcc_t , vlc_fourcc_t ) ); /** - * Chroma related informations. + * Chroma related information. */ typedef struct { unsigned plane_count; diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h index 839c4b9d84..5d5106b121 100644 --- a/include/vlc_input_item.h +++ b/include/vlc_input_item.h @@ -241,7 +241,7 @@ VLC_EXPORT( void, input_item_ReplaceInfos, ( input_item_t *, info_category_t * ) VLC_EXPORT( void, input_item_MergeInfos, ( input_item_t *, info_category_t * ) ); /** - * This function creates a new input_item_t with the provided informations. + * This function creates a new input_item_t with the provided information. * * XXX You may also use input_item_New or input_item_NewExt as they need * less arguments. @@ -249,7 +249,7 @@ VLC_EXPORT( void, input_item_MergeInfos, ( input_item_t *, info_category_t * ) ) VLC_EXPORT( input_item_t *, input_item_NewWithType, ( vlc_object_t *, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, unsigned i_option_flags, mtime_t i_duration, int i_type ) LIBVLC_USED ); /** - * This function creates a new input_item_t with the provided informations. + * This function creates a new input_item_t with the provided information. * * Provided for convenience. */ @@ -257,7 +257,7 @@ VLC_EXPORT( input_item_t *, input_item_NewExt, (vlc_object_t *, const char *psz_ #define input_item_NewExt(a,b,c,d,e,f,g) input_item_NewExt( VLC_OBJECT(a),b,c,d,e,f,g) /** - * This function creates a new input_item_t with the provided informations. + * This function creates a new input_item_t with the provided information. * * Provided for convenience. */ diff --git a/include/vlc_picture.h b/include/vlc_picture.h index c16ceddb1f..9a524dcc45 100644 --- a/include/vlc_picture.h +++ b/include/vlc_picture.h @@ -220,7 +220,7 @@ static inline void picture_CopyProperties( picture_t *p_dst, const picture_t *p_ } /** - * This function will reset a picture informations (properties and quantizers). + * This function will reset a picture information (properties and quantizers). * It is sometimes useful for reusing pictures (like from a pool). */ VLC_EXPORT( void, picture_Reset, ( picture_t * ) ); diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h index e79ce7ef56..503f92db13 100644 --- a/include/vlc_vout_display.h +++ b/include/vlc_vout_display.h @@ -113,7 +113,7 @@ typedef struct { } vout_display_cfg_t; /** - * Informations from a vout_display_t to configure + * Information from a vout_display_t to configure * the core behaviour. * * By default they are all false. @@ -271,7 +271,7 @@ struct vout_display_t { */ video_format_t fmt; - /* Informations + /* Information * * You can only set them in the open function. */ diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 35864476ab..48c664b29e 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -400,7 +400,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) /* If the given string is NULL or empty, fill it by the return value of 'code' */ #define ON_EMPTY( psz, code ) do { if( !NONEMPTY( psz) ) { (psz) = code; } } while(0) - /* Retreive CDDB informations */ + /* Retreive CDDB information */ #ifdef HAVE_LIBCDDB char psz_year_buffer[4+1]; msg_Dbg( p_access, "fetching infos with CDDB" ); @@ -447,7 +447,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) pp_cd_text = NULL; } - /* Retrieve CD-TEXT informations but prefer CDDB */ + /* Retrieve CD-TEXT information but prefer CDDB */ if( i_cd_text > 0 && pp_cd_text[0] ) { const vlc_meta_t *p_disc = pp_cd_text[0]; @@ -522,7 +522,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) const char *psz_track_description = NULL; #ifdef HAVE_LIBCDDB - /* Retreive CDDB informations */ + /* Retreive CDDB information */ if( p_disc ) { cddb_track_t *t = cddb_disc_get_track( p_disc, i ); @@ -534,7 +534,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) } #endif - /* Retreive CD-TEXT informations but prefer CDDB */ + /* Retreive CD-TEXT information but prefer CDDB */ if( i+1 < i_cd_text && pp_cd_text[i+1] ) { const vlc_meta_t *t = pp_cd_text[i+1]; diff --git a/modules/access/sftp.c b/modules/access/sftp.c index ce253cf64b..9f419a63d8 100644 --- a/modules/access/sftp.c +++ b/modules/access/sftp.c @@ -198,11 +198,11 @@ static int Open( vlc_object_t* p_this ) goto error; } - /* Get some informations */ + /* Get some information */ LIBSSH2_SFTP_ATTRIBUTES attributes; if( libssh2_sftp_stat( p_sys->sftp_session, url.psz_path, &attributes ) ) { - msg_Err( p_access, "Impossible to get informations about the remote file %s", url.psz_path ); + msg_Err( p_access, "Impossible to get information about the remote file %s", url.psz_path ); goto error; } p_access->info.i_size = attributes.filesize; diff --git a/modules/access/zip/zipaccess.c b/modules/access/zip/zipaccess.c index f862b0cdd3..9f4faf46ed 100644 --- a/modules/access/zip/zipaccess.c +++ b/modules/access/zip/zipaccess.c @@ -165,7 +165,7 @@ int AccessOpen( vlc_object_t *p_this ) unz_file_info z_info; unzGetCurrentFileInfo( file, &z_info, NULL, 0, NULL, 0, NULL, 0 ); - /* Set access informations: size is needed for AccessSeek */ + /* Set access information: size is needed for AccessSeek */ p_access->info.i_size = z_info.uncompressed_size; p_access->info.i_pos = 0; p_access->info.b_eof = false; diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c index 920ed22a73..ac31b7c475 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -215,7 +215,7 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context, /* */ p_dec->fmt_out.i_cat = AUDIO_ES; - /* Try to set as much informations as possible but do not trust it */ + /* Try to set as much information as possible but do not trust it */ SetupOutputFormat( p_dec, false ); date_Set( &p_sys->end_date, 0 ); diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 8ef7b94432..86c9478119 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -3324,7 +3324,7 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, ts_teletext_page_t p_page[2 * 64 + 20]; unsigned i_page = 0; - /* Gather pages informations */ + /* Gather pages information */ #if defined _DVBPSI_DR_56_H_ && \ defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ ) diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp index 5368bf0eb7..bc2c643546 100644 --- a/modules/gui/qt4/components/playlist/playlist.cpp +++ b/modules/gui/qt4/components/playlist/playlist.cpp @@ -114,7 +114,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par ) leftSplitter->setMaximumWidth( 250 ); setCollapsible( 1, false ); - /* In case we want to keep the splitter informations */ + /* In case we want to keep the splitter information */ // components shall never write there setting to a fixed location, may infer // with other uses of the same component... getSettings()->beginGroup("Playlist"); diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index 9ee9467511..2bbe79ea12 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -289,7 +289,7 @@ void VLMDialog::mediasPopulator() int vlmItemCount; vlm_media_t ***ppp_dsc = (vlm_media_t ***)malloc( sizeof( vlm_media_t ) ); - /* Get medias informations and numbers */ + /* Get medias information and numbers */ vlm_Control( p_vlm, VLM_GET_MEDIAS, ppp_dsc, &i_nMedias ); /* Loop on all of them */ @@ -305,7 +305,7 @@ void VLMDialog::mediasPopulator() QString outputText = qfu( (*ppp_dsc)[i]->psz_output ); - /* Schedule media is a quite especial, maybe there is another way to grab informations */ + /* Schedule media is a quite especial, maybe there is another way to grab information */ if( (*ppp_dsc)[i]->b_vod ) { typeShortName = "VOD"; diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index a75756823d..11bcfdf87c 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -94,7 +94,7 @@ using namespace TagLib; /** - * Read meta informations from APE tags + * Read meta information from APE tags * @param tag: the APE tag * @param p_demux; the demux object * @param p_demux_meta: the demuxer meta @@ -156,7 +156,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* p_txxx->fieldList().toString().toCString( true ) ); } - // Get some more informations + // Get some more information #define SET( tagName, metaName ) \ list = tag->frameListMap()[tagName]; \ if( !list.isEmpty() ) \ @@ -271,7 +271,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* /** - * Read the meta informations from XiphComments + * Read the meta information from XiphComments * @param tag: the Xiph Comment * @param p_demux; the demux object * @param p_demux_meta: the demuxer meta @@ -484,7 +484,7 @@ static int ReadMeta( vlc_object_t* p_this) /** - * Write meta informations to APE tags + * Write meta information to APE tags * @param tag: the APE tag * @param p_item: the input item */ @@ -542,7 +542,7 @@ static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item ) /** - * Write the meta informations to XiphComments + * Write the meta information to XiphComments * @param tag: the Xiph Comment * @param p_input: the input item */ diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c index 0986842ac7..dbaa96b321 100644 --- a/modules/packetizer/copy.c +++ b/modules/packetizer/copy.c @@ -209,7 +209,7 @@ static block_t *PacketizeSub( decoder_t *p_dec, block_t **pp_block ) return p_block; } -/* Parse WMV3 packet and extract frame type informations */ +/* Parse WMV3 packet and extract frame type information */ static void ParseWMV3( decoder_t *p_dec, block_t *p_block ) { bs_t s; diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c index c4ef2e1009..e8bca937e9 100644 --- a/modules/stream_out/smem.c +++ b/modules/stream_out/smem.c @@ -32,7 +32,7 @@ * For example, you can use smem as it : * --sout="#transcode{vcodec=RV24,acodec=s16l}:smem{smem-options}" * - * Into each lock function (audio and video), you will have all the informations + * Into each lock function (audio and video), you will have all the information * you need to allocate a buffer, so that this module will copy data in it. * * the video-data and audio-data pointers will be passed to lock/unlock function diff --git a/src/control/video.c b/src/control/video.c index 60a1cee9b4..2f122a54a1 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -286,7 +286,7 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi ) if( i_ret < 0 ) { vlc_object_release( p_input_thread ); - libvlc_printerr( "Subtitle informations not found" ); + libvlc_printerr( "Subtitle information not found" ); return -1; } diff --git a/src/input/es_out.c b/src/input/es_out.c index 0fc7176070..239cd1985f 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -2862,7 +2862,7 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * if( !p_cat ) return; - /* Add informations */ + /* Add information */ const char *psz_type; switch( fmt->i_cat ) { diff --git a/src/interface/dialog.c b/src/interface/dialog.c index c1f21e2c99..fd3568c33f 100644 --- a/src/interface/dialog.c +++ b/src/interface/dialog.c @@ -131,7 +131,7 @@ void dialog_VFatal (vlc_object_t *obj, bool modal, const char *title, #undef dialog_Login /** * Requests a username and password through the user interface. - * @param obj the VLC object requesting credential informations + * @param obj the VLC object requesting credential information * @param username a pointer to the specified username [OUT] * @param password a pointer to the specified password [OUT] * @param title title for the dialog diff --git a/src/text/filesystem.c b/src/text/filesystem.c index e3147ebddf..d2f5324394 100644 --- a/src/text/filesystem.c +++ b/src/text/filesystem.c @@ -459,7 +459,7 @@ static int vlc_statEx( const char *filename, struct stat *buf, } /** - * Finds file/inode informations, as stat(). + * Finds file/inode information, as stat(). * Consider using fstat() instead, if possible. * * @param filename UTF-8 file path @@ -470,7 +470,7 @@ int vlc_stat( const char *filename, struct stat *buf) } /** - * Finds file/inode informations, as lstat(). + * Finds file/inode information, as lstat(). * Consider using fstat() instead, if possible. * * @param filename UTF-8 file path diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 1da4bfa319..318646ef47 100644 --- a/src/video_output/vout_pictures.c +++ b/src/video_output/vout_pictures.c @@ -266,7 +266,7 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r { video_format_t fmt = *p_fmt; - /* It is needed to be sure all informations are filled */ + /* It is needed to be sure all information are filled */ video_format_Setup( &fmt, p_fmt->i_chroma, p_fmt->i_width, p_fmt->i_height, p_fmt->i_sar_num, p_fmt->i_sar_den ); -- 2.39.2