Skip to content

V
vlc
Commit 923649f9 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* stringreview

parent bf1bb6bb
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 65 deletions
modules/video_filter/crop.c
View file @ 923649f9
......@@ -2,7 +2,7 @@
* crop.c : Crop video plugin for vlc
*****************************************************************************
* Copyright (C) 2002, 2003 VideoLAN
* $Id: crop.c,v 1.13 2003/10/15 22:49:48 gbazin Exp $
* $Id: crop.c,v 1.14 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -51,17 +51,17 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define GEOMETRY_TEXT N_("Crop geometry")
#define GEOMETRY_TEXT N_("Crop geometry (pixels)")
#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop. This is set as width x heigth + left offset + top offset.")
#define AUTOCROP_TEXT N_("Automatic cropping")
#define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping")
#define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping.")
vlc_module_begin();
add_category_hint( N_("Crop"), NULL, VLC_FALSE );
add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, VLC_FALSE );
add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, VLC_FALSE );
set_description( _("crop video filter") );
set_description( _("Crop video filter") );
set_capability( "video filter", 0 );
add_shortcut( "crop" );
set_callbacks( Create, Destroy );
......
modules/video_filter/distort.c
View file @ 923649f9
......@@ -2,7 +2,7 @@
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id: distort.c,v 1.12 2003/11/05 00:39:17 gbazin Exp $
* $Id: distort.c,v 1.13 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -67,7 +67,7 @@ vlc_module_begin();
add_string( "distort-mode", "wave", NULL, MODE_TEXT, MODE_LONGTEXT,
VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 );
set_description( _("miscellaneous distort video effects filter") );
set_description( _("Distort video filter") );
set_capability( "video filter", 0 );
add_shortcut( "distort" );
set_callbacks( Create, Destroy );
......@@ -114,53 +114,30 @@ static int Create( vlc_object_t *p_this )
p_vout->pf_display = NULL;
p_vout->p_sys->i_mode = 0;
/* Look what method was requested from command line*/
if( !(psz_method = psz_method_tmp = config_GetPsz( p_vout, "filter" )) )
{
msg_Err( p_vout, "configuration variable %s empty", "filter" );
return VLC_EGENERIC;
}
while( *psz_method && *psz_method != ':' )
{
psz_method++;
}
if( !strcmp( psz_method, ":wave" ) )
if( !(psz_method = psz_method_tmp
= config_GetPsz( p_vout, "distort-mode" )) )
{
msg_Err( p_vout, "configuration variable %s empty, using 'wave'",
"distort-mode" );
p_vout->p_sys->i_mode = DISTORT_MODE_WAVE;
}
else if( !strcmp( psz_method, ":ripple" ) )
else
{
p_vout->p_sys->i_mode = DISTORT_MODE_RIPPLE;
}
free( psz_method_tmp );
if( !p_vout->p_sys->i_mode )
{
/* No method given in commandline. Look what method was
requested in configuration system */
if( !(psz_method = psz_method_tmp
= config_GetPsz( p_vout, "distort-mode" )) )
if( !strcmp( psz_method, "wave" ) )
{
msg_Err( p_vout, "configuration variable %s empty, using 'wave'",
"distort-mode" );
p_vout->p_sys->i_mode = DISTORT_MODE_WAVE;
}
else {
if( !strcmp( psz_method, "wave" ) )
{
p_vout->p_sys->i_mode = DISTORT_MODE_WAVE;
}
else if( !strcmp( psz_method, "ripple" ) )
{
p_vout->p_sys->i_mode = DISTORT_MODE_RIPPLE;
}
else
{
msg_Err( p_vout, "no valid distort mode provided, "
"using wave" );
p_vout->p_sys->i_mode = DISTORT_MODE_WAVE;
}
else if( !strcmp( psz_method, "ripple" ) )
{
p_vout->p_sys->i_mode = DISTORT_MODE_RIPPLE;
}
else
{
msg_Err( p_vout, "no valid distort mode provided, "
"using wave" );
p_vout->p_sys->i_mode = DISTORT_MODE_WAVE;
}
}
free( psz_method_tmp );
......
modules/video_filter/invert.c
View file @ 923649f9
......@@ -2,7 +2,7 @@
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id: invert.c,v 1.8 2003/10/15 22:49:48 gbazin Exp $
* $Id: invert.c,v 1.9 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -49,7 +49,7 @@ static int SendEvents( vlc_object_t *, char const *,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("invert video filter") );
set_description( _("Invert video filter") );
set_capability( "video filter", 0 );
add_shortcut( "invert" );
set_callbacks( Create, Destroy );
......
modules/video_filter/logo.c
View file @ 923649f9
/*****************************************************************************
* logo.c : logo video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id: logo.c,v 1.6 2003/12/22 02:24:53 sam Exp $
* Copyright (C) 2003-2004 VideoLAN
* $Id: logo.c,v 1.7 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Simon Latapie <garf@videolan.org>
*
......@@ -61,7 +61,7 @@ static int MouseEvent( vlc_object_t *, char const *,
#define POSX_LONGTEXT N_("You can move the logo by left-clicking on it" )
#define POSY_TEXT N_("Y coordinate of the logo")
#define POSY_LONGTEXT N_("You can move the logo by left-clicking on it" )
#define TRANS_TEXT N_("transparency of the logo")
#define TRANS_TEXT N_("Transparency of the logo (255-0)")
#define TRANS_LONGTEXT N_("You can change it by middle-clicking and moving mouse left or right")
vlc_module_begin();
......@@ -69,8 +69,8 @@ vlc_module_begin();
add_file( "logo_file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
add_integer( "logo_x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
add_integer( "logo_y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
add_float( "logo_transparency", 1, NULL, TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
set_description( _("logo video filter") );
add_int_with_range( "logo_transparency", 255, 0, 255, NULL, TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
set_description( _("Logo video filter") );
set_capability( "video filter", 0 );
add_shortcut( "logo" );
set_callbacks( Create, Destroy );
......@@ -281,7 +281,7 @@ static int Init( vout_thread_t *p_vout )
p_vout->p_sys->posx = config_GetInt( p_vout, "logo_x" );
p_vout->p_sys->posy = config_GetInt( p_vout, "logo_y" );
p_vout->p_sys->trans = (int)(config_GetFloat( p_vout, "logo_transparency" ) * 255);
p_vout->p_sys->trans = config_GetInt( p_vout, "logo_transparency");
return VLC_SUCCESS;
}
......@@ -309,7 +309,6 @@ static void End( vout_thread_t *p_vout )
config_PutInt( p_vout, "logo_x", p_vout->p_sys->posx );
config_PutInt( p_vout, "logo_y", p_vout->p_sys->posy );
config_PutFloat( p_vout, "logo_transparency", (float)(p_vout->p_sys->trans) / 255.0 );
if (p_vout->p_sys->error == 0)
{
......@@ -391,7 +390,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
} else
{
p_out = p_outpic->p[i_index].p_pixels +
(p_vout->p_sys->posy/2)* p_outpic->p[i_index].i_pitch +
( p_vout->p_sys->posy 2 )* p_outpic->p[i_index].i_pitch +
p_vout->p_sys->posx / 2;
i_max = p_vout->p_sys->height / 2;
j_max = p_vout->p_sys->width / 2;
......@@ -406,7 +405,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{
for( j = 0 ; j < j_max ; j++)
{
*p_out = ( *p_out * ( 65025 - *p_in_a * tr) + *p_in * *p_in_a * tr) >> 16;
*p_out = ( *p_out * ( 65025 - *p_in_a * tr) + *p_in * *p_in_a * tr ) >> 16;
p_out++;
p_in++;
p_in_a++;
......
modules/video_filter/motionblur.c
View file @ 923649f9
......@@ -2,7 +2,7 @@
* motion_blur.c : motion blur filter for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id: motionblur.c,v 1.13 2003/10/15 22:49:48 gbazin Exp $
* $Id: motionblur.c,v 1.14 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -51,13 +51,13 @@ static int SendEvents( vlc_object_t *, char const *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define MODE_TEXT N_("Blur factor")
#define MODE_TEXT N_("Blur factor (1-127)")
#define MODE_LONGTEXT N_("The degree of blurring from 1 to 127")
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
add_integer_with_range( "blur-factor", 80, 1, 127, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
set_description( _("motion blur filter") );
set_description( _("Motion blur filter") );
set_capability( "video filter", 0 );
set_callbacks( Create, Destroy );
vlc_module_end();
......
modules/video_filter/transform.c
View file @ 923649f9
/*****************************************************************************
* transform.c : transform image plugin for vlc
* transform.c : transform image module for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id: transform.c,v 1.16 2003/11/13 21:15:43 gbazin Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: transform.c,v 1.17 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -67,7 +67,7 @@ vlc_module_begin();
add_string( "transform-type", "90", NULL,
TYPE_TEXT, TYPE_LONGTEXT, VLC_FALSE);
change_string_list( type_list, type_list_text, 0);
set_description( _("video transformation filter") );
set_description( _("Video transformation filter") );
set_capability( "video filter", 0 );
add_shortcut( "transform" );
set_callbacks( Create, Destroy );
......
modules/video_filter/wall.c
View file @ 923649f9
......@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id: wall.c,v 1.11 2003/10/15 22:49:48 gbazin Exp $
* $Id: wall.c,v 1.12 2004/01/25 03:28:41 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -59,7 +59,7 @@ static int SendEvents( vlc_object_t *, char const *,
"which to split the video")
#define ACTIVE_TEXT N_("Active windows")
#define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \
#define ACTIVE_LONGTEXT N_("Comma separated list of active windows, " \
"defaults to all")
vlc_module_begin();
......
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