* include/vlc_filter.h, vlc_video.h, src/video_output/vout_subpictures.c: new simpler...

[vlc] / modules / video_filter / marq.c

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index adf828955e5c6527cb7bee1bbe1c1ac84d83890c..f84a98fe5de1e049592aa3573691cd0b665f874f 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -84,8 +84,8 @@ struct filter_sys_t
                             "displayed, in milliseconds. Default value is " \
                             "0 (remain forever).")
 #define OPACITY_TEXT N_("Opacity, -1..255")
-#define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of overlay text. " \
-    "-1 = use freetype-opacity, 0 = transparent, 255 = totally opaque. " )
+#define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of " \
+    "overlay text. 0 = transparent, 255 = totally opaque. " )
 #define SIZE_TEXT N_("Font size, pixels")
 #define SIZE_LONGTEXT N_("Specify the font size, in pixels, " \
     "with -1 = use freetype-fontsize" )
@@ -123,7 +123,7 @@ vlc_module_begin();
     add_integer( "marq-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
     /* 5 sets the default to top [1] left [4] */
     change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-    add_integer_with_range( "marq-opacity", -1, -1, 255, NULL,
+    add_integer_with_range( "marq-opacity", 0, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
     add_integer( "marq-color", -1, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
         change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
@@ -276,9 +276,9 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         p_spu->i_y = p_sys->i_yoff;
         p_spu->b_absolute = VLC_TRUE;
     }
-    p_spu->p_region->i_font_color = p_sys->i_font_color;
-    p_spu->p_region->i_font_opacity = p_sys->i_font_opacity;
-    p_spu->p_region->i_font_size = p_sys->i_font_size;
+    p_spu->p_region->i_text_color = p_sys->i_font_color;
+    p_spu->p_region->i_text_alpha = p_sys->i_font_opacity;
+    p_spu->p_region->i_text_size = p_sys->i_font_size;
     
 
     p_sys->b_need_update = VLC_FALSE;