Commit 2e0102d9 authored by Sam Hocevar's avatar Sam Hocevar

* Spelling fixes here and there.

parent 81ac6629
...@@ -332,7 +332,7 @@ static void init_registry(void) ...@@ -332,7 +332,7 @@ static void init_registry(void)
#else #else
// regpathname is an external pointer // regpathname is an external pointer
// //
// registry.c is holding it's own internal pointer // registry.c is holding its own internal pointer
// localregpathname - which is being allocate/deallocated // localregpathname - which is being allocate/deallocated
if (localregpathname == 0) if (localregpathname == 0)
......
...@@ -4271,7 +4271,7 @@ static void expsrand(int seed) ...@@ -4271,7 +4271,7 @@ static void expsrand(int seed)
#if 1 #if 1
// prefered compilation with -O2 -ffast-math ! // preferred compilation with -O2 -ffast-math !
static double explog10(double x) static double explog10(double x)
{ {
......
...@@ -1217,7 +1217,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1217,7 +1217,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
} }
/* The AudioStreamSetProperty is not only asynchronious (requiring the locks) /* The AudioStreamSetProperty is not only asynchronious (requiring the locks)
* it is also not Atomic, in it's behaviour. * it is also not atomic in its behaviour.
* Therefore we check 5 times before we really give up. * Therefore we check 5 times before we really give up.
* FIXME: failing isn't actually implemented yet. */ * FIXME: failing isn't actually implemented yet. */
for( i = 0; i < 5; i++ ) for( i = 0; i < 5; i++ )
......
...@@ -455,7 +455,7 @@ static int cinepak_decode_frame( cinepak_context_t *p_context, ...@@ -455,7 +455,7 @@ static int cinepak_decode_frame( cinepak_context_t *p_context,
i_strip_id = GET2BYTES( p_data ); i_strip_id = GET2BYTES( p_data );
i_strip_size = GET2BYTES( p_data ); i_strip_size = GET2BYTES( p_data );
i_strip_size = __MIN( i_strip_size, i_length ); i_strip_size = __MIN( i_strip_size, i_length );
/* FIXME I don't really understand how it's work; */ /* FIXME I don't really understand how it works; */
i_strip_y1 = i_strip_y2 + GET2BYTES( p_data ); i_strip_y1 = i_strip_y2 + GET2BYTES( p_data );
i_strip_x1 = GET2BYTES( p_data ); i_strip_x1 = GET2BYTES( p_data );
i_strip_y2 = i_strip_y2 + GET2BYTES( p_data ); i_strip_y2 = i_strip_y2 + GET2BYTES( p_data );
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* *
* FIXME: * FIXME:
* DVB subtitles coded as strings of characters are not handled correctly. * DVB subtitles coded as strings of characters are not handled correctly.
* The character codes in the string should actually be indexes refering to a * The character codes in the string should actually be indexes referring to a
* character table identified in the subtitle descriptor. * character table identified in the subtitle descriptor.
*****************************************************************************/ *****************************************************************************/
#include <vlc/vlc.h> #include <vlc/vlc.h>
......
...@@ -145,8 +145,8 @@ typedef struct ...@@ -145,8 +145,8 @@ typedef struct
/**************************************************************************** /****************************************************************************
* High level asf object * High level asf object
****************************************************************************/ ****************************************************************************/
/* This is the first header find in a asf file /* This is the first header found in an asf file
* It's the only object that have subobject */ * It's the only object that has subobjects */
typedef struct typedef struct
{ {
ASF_OBJECT_COMMON ASF_OBJECT_COMMON
......
...@@ -737,7 +737,7 @@ describe: ...@@ -737,7 +737,7 @@ describe:
if( p_sdp == NULL ) if( p_sdp == NULL )
{ {
/* failure occured */ /* failure occurred */
int i_code = 0; int i_code = 0;
const char *psz_error = p_sys->env->getResultMsg(); const char *psz_error = p_sys->env->getResultMsg();
......
...@@ -149,7 +149,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -149,7 +149,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
START_SPREFS_CAT( Subtitles ); START_SPREFS_CAT( Subtitles );
CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
CONFIG_GENERIC( "sub-language", String, NULL, preferedLanguage ); CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
CONFIG_GENERIC( "freetype-font", String, NULL, font ); /* FIXME -> use file instead of string */ CONFIG_GENERIC( "freetype-font", String, NULL, font ); /* FIXME -> use file instead of string */
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
......
...@@ -98,12 +98,12 @@ ...@@ -98,12 +98,12 @@
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string>Prefered audio language</string> <string>Preferred audio language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1" >
<widget class="QComboBox" name="preferedAudioLanguage" /> <widget class="QComboBox" name="preferredAudioLanguage" />
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>This is the new VLC default interface. It's dialogs give access to most VLC features.</string> <string>This is the new VLC default interface. Its dialogs give access to most VLC features.</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>true</bool> <bool>true</bool>
......
...@@ -97,12 +97,12 @@ ...@@ -97,12 +97,12 @@
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string>Subtitles prefered language</string> <string>Subtitles preferred language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLineEdit" name="preferedLanguage" /> <widget class="QLineEdit" name="preferredLanguage" />
</item> </item>
</layout> </layout>
</widget> </widget>
......
...@@ -1172,7 +1172,7 @@ void Playlist::OnDragItemEnd( wxTreeEvent& event ) ...@@ -1172,7 +1172,7 @@ void Playlist::OnDragItemEnd( wxTreeEvent& event )
if( !dest_tree_item.IsOk() ) return; if( !dest_tree_item.IsOk() ) return;
/* check that we're not trying to move a node into one of it's children */ /* check that we're not trying to move a node into one of its children */
wxTreeItemId parent = dest_tree_item; wxTreeItemId parent = dest_tree_item;
while( parent != treectrl->GetRootItem() ) while( parent != treectrl->GetRootItem() )
{ {
...@@ -1275,7 +1275,7 @@ bool PlaylistFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, ...@@ -1275,7 +1275,7 @@ bool PlaylistFileDropTarget::OnDropFiles( wxCoord x, wxCoord y,
{ {
/* This is a leaf. Append right after it /* This is a leaf. Append right after it
* We thus need to find the parrent node and the position of the * We thus need to find the parrent node and the position of the
* leaf in it's children list */ * leaf in its children list */
wxTreeItemId parent = p->treectrl->GetItemParent( item ); wxTreeItemId parent = p->treectrl->GetItemParent( item );
PlaylistItem *p_parent = PlaylistItem *p_parent =
(PlaylistItem *)p->treectrl->GetItemData( parent ); (PlaylistItem *)p->treectrl->GetItemData( parent );
......
...@@ -1500,7 +1500,7 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -1500,7 +1500,7 @@ static int Mux( sout_mux_t *p_mux )
if( p_stream->i_stream_id == 0xa0 && if( p_stream->i_stream_id == 0xa0 &&
p_data->i_pts <= 0 ) p_data->i_pts <= 0 )
{ {
/* XXX yes I know, it's awfull, but it's needed, /* XXX yes I know, it's awful, but it's needed,
* so don't remove it ... */ * so don't remove it ... */
p_data->i_pts = p_data->i_dts; p_data->i_pts = p_data->i_dts;
} }
......
...@@ -296,7 +296,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout, ...@@ -296,7 +296,7 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first; p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
#if 0 /* This is bad because the audio output might just be trying to fill #if 0 /* This is bad because the audio output might just be trying to fill
* in it's internal buffers. And anyway, it's up to the audio output * in its internal buffers. And anyway, it's up to the audio output
* to deal with this kind of starvation. */ * to deal with this kind of starvation. */
/* Set date to 0, to allow the mixer to send a new buffer ASAP */ /* Set date to 0, to allow the mixer to send a new buffer ASAP */
......
...@@ -85,7 +85,7 @@ static void Manager( intf_thread_t *p_intf ); ...@@ -85,7 +85,7 @@ static void Manager( intf_thread_t *p_intf );
* You can give some additional options to be used for interface initialization * You can give some additional options to be used for interface initialization
* *
* \param p_this the calling vlc_object_t * \param p_this the calling vlc_object_t
* \param psz_module a prefered interface module * \param psz_module a preferred interface module
* \param i_options number additional options * \param i_options number additional options
* \param ppsz_options additional option strings * \param ppsz_options additional option strings
* \return a pointer to the created interface thread, NULL on error * \return a pointer to the created interface thread, NULL on error
......
...@@ -1110,14 +1110,14 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name ) ...@@ -1110,14 +1110,14 @@ static void Help( libvlc_int_t *p_this, char const *psz_help_name )
static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
{ {
#define FORMAT_STRING " %s --%s%s%s%s%s%s%s " #define FORMAT_STRING " %s --%s%s%s%s%s%s%s "
/* short option ------' | | | | | | | /* short option ------' | | | | | | |
* option name ------------' | | | | | | * option name ------------' | | | | | |
* <bra -------------------------' | | | | | * <bra ---------------------' | | | | |
* option type or "" --------------' | | | | * option type or "" ----------' | | | |
* ket> -----------------------------' | | | * ket> -------------------------' | | |
* padding spaces ---------------------' | | * padding spaces -----------------' | |
* comment -------------------------------' | * comment --------------------------' |
* comment suffix --------------------------' * comment suffix ---------------------'
* *
* The purpose of having bra and ket is that we might i18n them as well. * The purpose of having bra and ket is that we might i18n them as well.
*/ */
......
...@@ -546,7 +546,7 @@ void GetFilesList( update_t *p_update, vlc_bool_t b_force ) ...@@ -546,7 +546,7 @@ void GetFilesList( update_t *p_update, vlc_bool_t b_force )
if( !strcmp( psz_eltname, "version" ) ) if( !strcmp( psz_eltname, "version" ) )
{ {
int i; int i;
/* look for a previous occurence of this release */ /* look for a previous occurrence of this release */
for( i = 0; i < p_update->i_releases; i++ ) for( i = 0; i < p_update->i_releases; i++ )
{ {
p_release = p_update->p_releases + i; p_release = p_update->p_releases + i;
......
...@@ -936,7 +936,7 @@ void __var_OptionParse( vlc_object_t *p_obj, const char *psz_option ) ...@@ -936,7 +936,7 @@ void __var_OptionParse( vlc_object_t *p_obj, const char *psz_option )
if( psz_value ) i_name_len = psz_value - psz_option; if( psz_value ) i_name_len = psz_value - psz_option;
else i_name_len = strlen( psz_option ); else i_name_len = strlen( psz_option );
/* It's too much of an hassle to remove the ':' when we parse /* It's too much of a hassle to remove the ':' when we parse
* the cmd line :) */ * the cmd line :) */
if( i_name_len && *psz_option == ':' ) if( i_name_len && *psz_option == ':' )
{ {
......
...@@ -174,7 +174,7 @@ void playlist_LockClear( playlist_t *p_playlist ) ...@@ -174,7 +174,7 @@ void playlist_LockClear( playlist_t *p_playlist )
* \param i_mode the mode used when adding * \param i_mode the mode used when adding
* \param i_pos the position in the playlist where to add. If this is * \param i_pos the position in the playlist where to add. If this is
* PLAYLIST_END the item will be added at the end of the playlist * PLAYLIST_END the item will be added at the end of the playlist
* regardless of it's size * regardless of its size
* \param b_playlist TRUE for playlist, FALSE for media library * \param b_playlist TRUE for playlist, FALSE for media library
* \return The id of the playlist item * \return The id of the playlist item
*/ */
...@@ -195,7 +195,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, ...@@ -195,7 +195,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
* \param i_mode the mode used when adding * \param i_mode the mode used when adding
* \param i_pos the position in the playlist where to add. If this is * \param i_pos the position in the playlist where to add. If this is
* PLAYLIST_END the item will be added at the end of the playlist * PLAYLIST_END the item will be added at the end of the playlist
* regardless of it's size * regardless of its size
* \param i_duration length of the item in milliseconds. * \param i_duration length of the item in milliseconds.
* \param ppsz_options an array of options * \param ppsz_options an array of options
* \param i_options the number of options * \param i_options the number of options
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment