Skip to content

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

String Review. refs #438

parent 3fa37fdc
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 21 deletions
modules/visualization/galaktos/plugin.c
View file @ fdb2f80a
...@@ -82,7 +82,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -82,7 +82,7 @@ static int Open( vlc_object_t *p_this )
if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' )
|| p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
{ {
msg_Warn( p_filter, "Bad input or output format" ); msg_Warn( p_filter, "bad input or output format" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
...@@ -219,7 +219,7 @@ static void Thread( vlc_object_t *p_this ) ...@@ -219,7 +219,7 @@ static void Thread( vlc_object_t *p_this )
module_Need( p_thread->p_opengl, "opengl provider", NULL, 0 ); module_Need( p_thread->p_opengl, "opengl provider", NULL, 0 );
if( p_thread->p_module == NULL ) if( p_thread->p_module == NULL )
{ {
msg_Err( p_thread, "No OpenGL provider found" ); msg_Err( p_thread, "no OpenGL provider found" );
vlc_object_detach( p_thread->p_opengl ); vlc_object_detach( p_thread->p_opengl );
vlc_object_destroy( p_thread->p_opengl ); vlc_object_destroy( p_thread->p_opengl );
return; return;
......
modules/visualization/goom.c
View file @ fdb2f80a
...@@ -136,7 +136,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -136,7 +136,7 @@ static int Open( vlc_object_t *p_this )
if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' )
|| p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
{ {
msg_Warn( p_filter, "Bad input or output format" ); msg_Warn( p_filter, "bad input or output format" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
......
modules/visualization/visual/effects.c
View file @ fdb2f80a
...@@ -95,7 +95,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -95,7 +95,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
if( !p_s16_buff ) if( !p_s16_buff )
{ {
msg_Err(p_aout,"Out of memory"); msg_Err(p_aout,"out of memory");
return -1; return -1;
} }
...@@ -120,7 +120,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -120,7 +120,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
p_effect->p_data=(void *)malloc(i_nb_bands * sizeof(int) ); p_effect->p_data=(void *)malloc(i_nb_bands * sizeof(int) );
if( !p_effect->p_data) if( !p_effect->p_data)
{ {
msg_Err(p_aout,"Out of memory"); msg_Err(p_aout,"out of memory");
return -1; return -1;
} }
peaks = (int *)p_effect->p_data; peaks = (int *)p_effect->p_data;
...@@ -139,7 +139,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -139,7 +139,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
height = (int *)malloc( i_nb_bands * sizeof(int) ); height = (int *)malloc( i_nb_bands * sizeof(int) );
if( !height) if( !height)
{ {
msg_Err(p_aout,"Out of memory"); msg_Err(p_aout,"out of memory");
return -1; return -1;
} }
/* Convert the buffer to int16_t */ /* Convert the buffer to int16_t */
...@@ -157,7 +157,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -157,7 +157,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
p_state = visual_fft_init(); p_state = visual_fft_init();
if( !p_state) if( !p_state)
{ {
msg_Err(p_aout,"Unable to initialize FFT transform"); msg_Err(p_aout,"unable to initialize FFT transform");
return -1; return -1;
} }
p_buffs = p_s16_buff; p_buffs = p_s16_buff;
...@@ -391,7 +391,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -391,7 +391,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
if( !p_s16_buff ) if( !p_s16_buff )
{ {
msg_Err(p_aout,"Out of memory"); msg_Err(p_aout,"out of memory");
return -1; return -1;
} }
...@@ -425,7 +425,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -425,7 +425,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
p_effect->p_data=(void *)malloc(i_nb_bands * sizeof(int) ); p_effect->p_data=(void *)malloc(i_nb_bands * sizeof(int) );
if( !p_effect->p_data) if( !p_effect->p_data)
{ {
msg_Err(p_aout,"Out of memory"); msg_Err(p_aout,"out of memory");
return -1; return -1;
} }
peaks = (int *)p_effect->p_data; peaks = (int *)p_effect->p_data;
...@@ -442,7 +442,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -442,7 +442,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
height = (int *)malloc( i_nb_bands * sizeof(int) ); height = (int *)malloc( i_nb_bands * sizeof(int) );
if( !height) if( !height)
{ {
msg_Err(p_aout,"Out of memory"); msg_Err(p_aout,"out of memory");
return -1; return -1;
} }
...@@ -461,7 +461,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -461,7 +461,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
p_state = visual_fft_init(); p_state = visual_fft_init();
if( !p_state) if( !p_state)
{ {
msg_Err(p_aout,"Unable to initialize FFT transform"); msg_Err(p_aout,"unable to initialize FFT transform");
return -1; return -1;
} }
p_buffs = p_s16_buff; p_buffs = p_s16_buff;
......
modules/visualization/visual/visual.c
View file @ fdb2f80a
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define ELIST_TEXT N_( "Effects list" ) #define ELIST_TEXT N_( "Effects list" )
#define ELIST_LONGTEXT N_( \ #define ELIST_LONGTEXT N_( \
"A list of visual effect, separated by commas.\n" \ "A list of visual effect, separated by commas.\n" \
"Current effects include: dummy, scope, spectrum" ) "Current effects include: dummy, scope, spectrum." )
#define WIDTH_TEXT N_( "Video width" ) #define WIDTH_TEXT N_( "Video width" )
#define WIDTH_LONGTEXT N_( \ #define WIDTH_LONGTEXT N_( \
...@@ -261,7 +261,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -261,7 +261,7 @@ static int Open( vlc_object_t *p_this )
if( ( psz_eoa = strchr( psz_parser, '}') ) == NULL ) if( ( psz_eoa = strchr( psz_parser, '}') ) == NULL )
{ {
msg_Err( p_filter, "Unable to parse effect list. Aborting"); msg_Err( p_filter, "unable to parse effect list. Aborting");
break; break;
} }
p_effect->psz_args = p_effect->psz_args =
...@@ -422,7 +422,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -422,7 +422,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
{ {
aout_filter_t *p_filter = (aout_filter_t *)p_this; aout_filter_t *p_filter = (aout_filter_t *)p_this;
/* restart this baby */ /* restart this baby */
msg_Dbg( p_filter, "We should restart the visual filter" ); msg_Dbg( p_filter, "we should restart the visual filter" );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
modules/visualization/xosd.c
View file @ fdb2f80a
...@@ -62,24 +62,25 @@ static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable, ...@@ -62,24 +62,25 @@ static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
*****************************************************************************/ *****************************************************************************/
#define POSITION_TEXT N_("Flip vertical position") #define POSITION_TEXT N_("Flip vertical position")
#define POSITION_LONGTEXT N_("Display xosd output on the bottom of the " \ #define POSITION_LONGTEXT N_("Display xosd output on the bottom of the " \
"screen instead of the top") "screen instead of the top.")
#define TXT_OFS_TEXT N_("Vertical offset") #define TXT_OFS_TEXT N_("Vertical offset")
#define TXT_OFS_LONGTEXT N_("Vertical offset in pixels of the displayed text") #define TXT_OFS_LONGTEXT N_("Vertical offset in pixels of the displayed " \
"text (default 30 px).")
#define SHD_OFS_TEXT N_("Shadow offset") #define SHD_OFS_TEXT N_("Shadow offset")
#define SHD_OFS_LONGTEXT N_("Offset in pixels of the shadow") #define SHD_OFS_LONGTEXT N_("Offset in pixels of the shadow (default 2 px).")
#define FONT_TEXT N_("Font") #define FONT_TEXT N_("Font")
#define FONT_LONGTEXT N_("Font used to display text in the xosd output") #define FONT_LONGTEXT N_("Font used to display text in the xosd output.")
/* FIXME FIXME FIXME: Gettextize */ #define COLOUR_TEXT N_("Color")
#define COLOUR_TEXT ("Colour") #define COLOUR_LONGTEXT N_("Color used to display text in the xosd output.")
#define COLOUR_LONGTEXT ("Colour used to display text in the xosd output")
vlc_module_begin(); vlc_module_begin();
set_category( CAT_INTERFACE ); set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL ); set_subcategory( SUBCAT_INTERFACE_CONTROL );
set_description( _("XOSD interface") ); set_description( _("XOSD interface") );
set_shortname( "XOSD" );
add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, VLC_TRUE ); add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, VLC_TRUE );
add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, VLC_TRUE ); add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, VLC_TRUE );
add_integer( "xosd-shadow-offset", 2, NULL, add_integer( "xosd-shadow-offset", 2, NULL,
......
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