Skip to content

V
vlc-2-2
Commit 07b14714 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

misc/*: 2nd lecture. refs #438

parent 57dd32ab
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 47 deletions
modules/misc/dummy/interface.c
View file @ 07b14714
......@@ -49,7 +49,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
CONSOLE_INTRO_MSG;
#endif
msg_Info( p_intf, "Using the dummy interface module..." );
msg_Info( p_intf, "using the dummy interface module..." );
p_intf->pf_run = Run;
......
modules/misc/freetype.c
View file @ 07b14714
......@@ -109,7 +109,7 @@ static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"),
"This option is only needed if you want to encode into DVB subtitles" )
#define EFFECT_TEXT N_("Font Effect")
#define EFFECT_LONGTEXT N_("It is possible to apply effects to the rendered" \
"text to improve rendering." )
"text to improve its readability." )
#define EFFECT_BACKGROUND 1
#define EFFECT_OUTLINE 2
......@@ -880,14 +880,14 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT );
if( i_error )
{
msg_Err( p_filter, "Unable to render text (FT_Load_Glyph returned"
msg_Err( p_filter, "unable to render text FT_Load_Glyph returned"
" %d", i_error );
goto error;
}
i_error = FT_Get_Glyph( glyph, &tmp_glyph );
if( i_error )
{
msg_Err( p_filter, "Unable to render text (FT_Get_Glyph returned "
msg_Err( p_filter, "unable to render text FT_Get_Glyph returned "
"%d", i_error );
goto error;
}
......@@ -1054,11 +1054,11 @@ static int SetFontSize( filter_t *p_filter, int i_size )
}
if( i_size <= 0 )
{
msg_Warn( p_filter, "Invalid fontsize, using 12" );
msg_Warn( p_filter, "invalid fontsize, using 12" );
i_size = 12;
}
msg_Dbg( p_filter, "Using fontsize: %i", i_size );
msg_Dbg( p_filter, "using fontsize: %i", i_size );
}
p_sys->i_font_size = i_size;
......
modules/misc/gnutls.c
View file @ 07b14714
......@@ -448,7 +448,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this,
dir = utf8_opendir( psz_dirname );
if( dir == NULL )
{
msg_Warn( p_this, "Cannot open directory (%s): %s", psz_dirname,
msg_Warn( p_this, "cannot open directory (%s): %s", psz_dirname,
strerror( errno ) );
return VLC_EGENERIC;
}
......@@ -518,13 +518,13 @@ gnutls_Addx509File( vlc_object_t *p_this,
if( i < 0 )
{
msg_Warn( p_this, "Cannot add x509 credentials (%s): %s",
msg_Warn( p_this, "cannot add x509 credentials (%s): %s",
psz_path, gnutls_strerror( i ) );
return VLC_EGENERIC;
}
else
{
msg_Dbg( p_this, "Added x509 credentials (%s)",
msg_Dbg( p_this, "added x509 credentials (%s)",
psz_path );
return VLC_SUCCESS;
}
......@@ -532,13 +532,13 @@ gnutls_Addx509File( vlc_object_t *p_this,
else if( S_ISDIR( st.st_mode ) )
{
msg_Dbg( p_this,
"Looking recursively for x509 credentials in %s",
"looking recursively for x509 credentials in %s",
psz_path );
return gnutls_Addx509Directory( p_this, cred, psz_path, b_priv);
}
}
else
msg_Warn( p_this, "Cannot add x509 credentials (%s): %s",
msg_Warn( p_this, "cannot add x509 credentials (%s): %s",
psz_path, strerror( errno ) );
return VLC_EGENERIC;
}
......@@ -587,7 +587,7 @@ gnutls_ClientCreate( tls_t *p_tls )
i_val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred );
if( i_val != 0 )
{
msg_Err( p_tls, "Cannot allocate X509 credentials: %s",
msg_Err( p_tls, "cannot allocate X509 credentials: %s",
gnutls_strerror( i_val ) );
goto error;
}
......@@ -635,7 +635,7 @@ gnutls_ClientCreate( tls_t *p_tls )
i_val = gnutls_init( &p_sys->session.session, GNUTLS_CLIENT );
if( i_val != 0 )
{
msg_Err( p_tls, "Cannot initialize TLS session: %s",
msg_Err( p_tls, "cannot initialize TLS session: %s",
gnutls_strerror( i_val ) );
gnutls_certificate_free_credentials( p_sys->x509_cred );
goto error;
......@@ -644,7 +644,7 @@ gnutls_ClientCreate( tls_t *p_tls )
i_val = gnutls_set_default_priority( p_sys->session.session );
if( i_val < 0 )
{
msg_Err( p_tls, "Cannot set ciphers priorities: %s",
msg_Err( p_tls, "cannot set ciphers priorities: %s",
gnutls_strerror( i_val ) );
gnutls_deinit( p_sys->session.session );
gnutls_certificate_free_credentials( p_sys->x509_cred );
......@@ -655,7 +655,7 @@ gnutls_ClientCreate( tls_t *p_tls )
cert_type_priority );
if( i_val < 0 )
{
msg_Err( p_tls, "Cannot set certificate type priorities: %s",
msg_Err( p_tls, "cannot set certificate type priorities: %s",
gnutls_strerror( i_val ) );
gnutls_deinit( p_sys->session.session );
gnutls_certificate_free_credentials( p_sys->x509_cred );
......@@ -667,7 +667,7 @@ gnutls_ClientCreate( tls_t *p_tls )
p_sys->x509_cred );
if( i_val < 0 )
{
msg_Err( p_tls, "Cannot set TLS session credentials: %s",
msg_Err( p_tls, "cannot set TLS session credentials: %s",
gnutls_strerror( i_val ) );
gnutls_deinit( p_sys->session.session );
gnutls_certificate_free_credentials( p_sys->x509_cred );
......@@ -823,7 +823,7 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server )
i_val = gnutls_init( &session, GNUTLS_SERVER );
if( i_val != 0 )
{
msg_Err( p_server, "Cannot initialize TLS session: %s",
msg_Err( p_server, "cannot initialize TLS session: %s",
gnutls_strerror( i_val ) );
goto error;
}
......@@ -833,7 +833,7 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server )
i_val = gnutls_set_default_priority( session );
if( i_val < 0 )
{
msg_Err( p_server, "Cannot set ciphers priorities: %s",
msg_Err( p_server, "cannot set ciphers priorities: %s",
gnutls_strerror( i_val ) );
gnutls_deinit( session );
goto error;
......@@ -843,7 +843,7 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server )
p_server_sys->x509_cred );
if( i_val < 0 )
{
msg_Err( p_server, "Cannot set TLS session credentials: %s",
msg_Err( p_server, "cannot set TLS session credentials: %s",
gnutls_strerror( i_val ) );
gnutls_deinit( session );
goto error;
......@@ -918,7 +918,7 @@ gnutls_ServerAddCA( tls_server_t *p_server, const char *psz_ca_path )
LocaleFree( psz_local_path );
if( val < 0 )
{
msg_Err( p_server, "Cannot add trusted CA (%s): %s", psz_ca_path,
msg_Err( p_server, "cannot add trusted CA (%s): %s", psz_ca_path,
gnutls_strerror( val ) );
return VLC_EGENERIC;
}
......@@ -950,7 +950,7 @@ gnutls_ServerAddCRL( tls_server_t *p_server, const char *psz_crl_path )
LocaleFree( psz_crl_path );
if( val < 0 )
{
msg_Err( p_server, "Cannot add CRL (%s): %s", psz_crl_path,
msg_Err( p_server, "cannot add CRL (%s): %s", psz_crl_path,
gnutls_strerror( val ) );
return VLC_EGENERIC;
}
......@@ -974,7 +974,7 @@ gnutls_ServerCreate( tls_t *p_tls, const char *psz_cert_path,
char *psz_local_key, *psz_local_cert;
int val;
msg_Dbg( p_tls, "Creating TLS server" );
msg_Dbg( p_tls, "creating TLS server" );
p_sys = (tls_server_sys_t *)malloc( sizeof(struct tls_server_sys_t) );
if( p_sys == NULL )
......@@ -1016,7 +1016,7 @@ gnutls_ServerCreate( tls_t *p_tls, const char *psz_cert_path,
val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred );
if( val != 0 )
{
msg_Err( p_server, "Cannot allocate X509 credentials: %s",
msg_Err( p_server, "cannot allocate X509 credentials: %s",
gnutls_strerror( val ) );
goto error;
}
......@@ -1030,7 +1030,7 @@ gnutls_ServerCreate( tls_t *p_tls, const char *psz_cert_path,
LocaleFree( psz_key_path );
if( val < 0 )
{
msg_Err( p_server, "Cannot set certificate chain or private key: %s",
msg_Err( p_server, "cannot set certificate chain or private key: %s",
gnutls_strerror( val ) );
gnutls_certificate_free_credentials( p_sys->x509_cred );
goto error;
......@@ -1043,18 +1043,18 @@ gnutls_ServerCreate( tls_t *p_tls, const char *psz_cert_path,
val = gnutls_dh_params_init( &p_sys->dh_params );
if( val >= 0 )
{
msg_Dbg( p_server, "Computing Diffie Hellman ciphers parameters" );
msg_Dbg( p_server, "computing Diffie Hellman ciphers parameters" );
val = gnutls_dh_params_generate2( p_sys->dh_params,
get_Int( p_tls, "gnutls-dh-bits" ) );
}
if( val < 0 )
{
msg_Err( p_server, "Cannot initialize DH cipher suites: %s",
msg_Err( p_server, "cannot initialize DH cipher suites: %s",
gnutls_strerror( val ) );
gnutls_certificate_free_credentials( p_sys->x509_cred );
goto error;
}
msg_Dbg( p_server, "Ciphers parameters computed" );
msg_Dbg( p_server, "ciphers parameters computed" );
gnutls_certificate_set_dh_params( p_sys->x509_cred, p_sys->dh_params);
......
modules/misc/growl.c
View file @ 07b14714
......@@ -51,11 +51,7 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset );
/*****************************************************************************
* Module descriptor
*****************************************************************************
* This module should be used on windows with MSN (i think that you need to
* have MSN 7 or newer) to "advertise" what you are playing in VLC.
* You need to enable the "What I'm Listening To" option in MSN.
*****************************************************************************/
****************************************************************************/
#define SERVER_DEFAULT "127.0.0.1"
#define SERVER_TEXT N_("Growl server")
#define SERVER_LONGTEXT N_("This is the host to which Growl notifications " \
......@@ -69,7 +65,7 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset );
vlc_module_begin();
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
set_shortname( N_( "growl" ) );
set_shortname( N_( "Growl" ) );
set_description( _("Growl Notification Plugin") );
add_string( "growl-server", SERVER_DEFAULT, NULL,
......
modules/misc/logger.c
View file @ 07b14714
......@@ -138,8 +138,8 @@ vlc_module_begin();
VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 );
add_string( "rrd-file", NULL, NULL, N_("RRD output file") ,
N_("Output data for RRDTool in this file" ), VLC_TRUE );
add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
N_("Output data for RRDTool in this file." ), VLC_TRUE );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
......@@ -154,7 +154,7 @@ static int Open( vlc_object_t *p_this )
char *psz_mode, *psz_file, *psz_rrd_file;
CONSOLE_INTRO_MSG;
msg_Info( p_intf, "Using logger..." );
msg_Info( p_intf, "using logger..." );
/* Allocate instance and initialize some members */
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
......@@ -205,7 +205,7 @@ static int Open( vlc_object_t *p_this )
if( !psz_homedir )
{
msg_Err( p_this, "Unable to find home directory" );
msg_Err( p_this, "unable to find home directory" );
return -1;
}
psz_file = (char *)malloc( sizeof("/" LOG_DIR "/" LOG_FILE_HTML) +
......
modules/misc/msn.c
View file @ 07b14714
......@@ -205,7 +205,6 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
MSN_MAX_LENGTH,
"\\0Music\\01\\0%s\\0%s\\0%s\\0%s\\0\\0\\0",
p_intf->p_sys->psz_format,
//FORMAT_DEFAULT,
psz_title,
psz_artist,
psz_album );
......
modules/misc/network/ipv4.c
View file @ 07b14714
......@@ -114,7 +114,7 @@ static int BuildAddr( vlc_object_t *p_obj, struct sockaddr_in * p_socket,
hints.ai_socktype = SOCK_DGRAM;
hints.ai_flags = AI_PASSIVE;
msg_Dbg( p_obj, "Resolving %s:%d...", psz_address, i_port );
msg_Dbg( p_obj, "resolving %s:%d...", psz_address, i_port );
i_val = vlc_getaddrinfo( p_obj, psz_address, i_port, &hints, &res );
if( i_val )
{
......
modules/misc/network/ipv6.c
View file @ 07b14714
......@@ -374,7 +374,7 @@ static int OpenUDP( vlc_object_t * p_this )
}
else
{
msg_Err( p_this, "%s: bad IPv6 interface spefication",
msg_Err( p_this, "%s: bad IPv6 interface specification",
psz_mif );
close( i_handle );
return 0;
......
modules/misc/playlist/m3u.c
View file @ 07b14714
......@@ -46,7 +46,7 @@ int Export_M3U( vlc_object_t *p_this )
playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
int i, j;
msg_Dbg(p_playlist, "Saving using M3U format");
msg_Dbg(p_playlist, "saving using M3U format");
/* Write header */
fprintf( p_export->p_file, "#EXTM3U\n" );
......
modules/misc/playlist/old.c
View file @ 07b14714
......@@ -48,7 +48,7 @@ int Export_Old( vlc_object_t *p_this )
playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
int i;
msg_Dbg(p_playlist, "Saving using old format");
msg_Dbg(p_playlist, "saving using old format");
/* Write header */
fprintf( p_export->p_file , PLAYLIST_FILE_HEADER "\n" );
......
modules/misc/svg.c
View file @ 07b14714
......@@ -193,7 +193,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
}
else
{
msg_Dbg( p_this, "Reading %ld bytes from template %s",
msg_Dbg( p_this, "reading %ld bytes from template %s",
(unsigned long)s.st_size, psz_filename );
psz_template = malloc( s.st_size + 42 );
......
modules/misc/win32text.c
View file @ 07b14714
......@@ -64,7 +64,9 @@ static int SetFont( filter_t *, int );
"255 = totally opaque. " )
#define COLOR_TEXT N_("Text default color")
#define COLOR_LONGTEXT N_("The color of the text that will be rendered on "\
"the video. This must be an hexadecimal (like HTML colors). The first two "\ "chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\ " #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" )
"the video. This must be an hexadecimal (like HTML colors). The first two "\
"chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\
" #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" )
#define FONTSIZER_TEXT N_("Relative font size")
#define FONTSIZER_LONGTEXT N_("This is the relative default size of the " \
"fonts that will be rendered on the video. If absolute font size is set, "\
......@@ -410,11 +412,11 @@ static int SetFont( filter_t *p_filter, int i_size )
}
if( i_size <= 0 )
{
msg_Warn( p_filter, "Invalid fontsize, using 12" );
msg_Warn( p_filter, "invalid fontsize, using 12" );
i_size = 12;
}
msg_Dbg( p_filter, "Using fontsize: %i", i_size );
msg_Dbg( p_filter, "using fontsize: %i", i_size );
}
p_sys->i_font_size = i_size;
......
modules/misc/xml/libxml.c
View file @ 07b14714
......@@ -127,7 +127,7 @@ static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *p_stream )
NULL, NULL, 0 );
if( !p_libxml_reader )
{
msg_Err( p_xml, "failed to create xml parser" );
msg_Err( p_xml, "failed to create XML parser" );
return 0;
}
......
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