Commit ea0fe7b3 authored by Antoine Cellerier's avatar Antoine Cellerier

remove tabs and trailing spaces

parent 56525909
......@@ -45,14 +45,14 @@ static subpicture_t *Filter( filter_t *, mtime_t );
static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval,
void *p_data );
static int pi_color_values[] = { 0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0,
0x00FFFFFF, 0x00800000, 0x00FF0000, 0x00FF00FF, 0x00FFFF00,
0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080,
0x00000080, 0x000000FF, 0x0000FFFF};
static char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
static int pi_color_values[] = { 0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0,
0x00FFFFFF, 0x00800000, 0x00FF0000, 0x00FF00FF, 0x00FFFF00,
0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080,
0x00000080, 0x000000FF, 0x0000FFFF};
static char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), N_("Red"),
N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"),
N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"),
N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"),
N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"),
N_("Aqua") };
/*****************************************************************************
......@@ -67,7 +67,7 @@ struct filter_sys_t
char *psz_marquee; /* marquee string */
int i_font_color, i_font_opacity, i_font_size; /* font control */
time_t last_time;
vlc_bool_t b_need_update;
......@@ -277,7 +277,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
}
else
{ /* set to an absolute xy, referenced to upper left corner */
p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
p_spu->i_x = p_sys->i_xoff;
p_spu->i_y = p_sys->i_yoff;
p_spu->b_absolute = VLC_TRUE;
......@@ -285,7 +285,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
p_spu->p_region->i_text_color = p_sys->i_font_color;
p_spu->p_region->i_text_alpha = 255 - p_sys->i_font_opacity;
p_spu->p_region->i_text_size = p_sys->i_font_size;
p_sys->b_need_update = VLC_FALSE;
return p_spu;
......@@ -313,11 +313,11 @@ static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var,
{
p_sys->i_yoff = newval.i_int;
}
else if ( !strncmp( psz_var, "marq-color", 8 ) ) /* "marq-col" */
else if ( !strncmp( psz_var, "marq-color", 8 ) ) /* "marq-col" */
{
p_sys->i_font_color = newval.i_int;
}
else if ( !strncmp( psz_var, "marq-opacity", 8 ) ) /* "marq-opa" */
else if ( !strncmp( psz_var, "marq-opacity", 8 ) ) /* "marq-opa" */
{
p_sys->i_font_opacity = newval.i_int;
}
......
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