#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
-#include "vlc_filter.h"
-#include "vlc_block.h"
-#include "vlc_osd.h"
+#include <vlc_filter.h>
+#include <vlc_block.h>
-#include "vlc_strings.h"
+#include <vlc_strings.h>
/*****************************************************************************
* Local prototypes
"0 (remains forever).")
#define REFRESH_TEXT N_("Refresh period in ms")
#define REFRESH_LONGTEXT N_("Number of milliseconds between string updates. " \
- "This is mainly usefull when using meta data " \
+ "This is mainly useful when using meta data " \
"or time format string sequences.")
#define OPACITY_TEXT N_("Opacity")
#define OPACITY_LONGTEXT N_("Opacity (inverse of transparency) of " \
#define CFG_PREFIX "marq-"
+#define MARQUEE_HELP N_("Display text above the video")
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
set_capability( "sub filter", 0 )
set_shortname( N_("Marquee" ))
+ set_description( N_("Marquee display") )
+ set_help(MARQUEE_HELP)
set_callbacks( CreateFilter, DestroyFilter )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
add_integer( CFG_PREFIX "refresh", 1000, NULL, REFRESH_TEXT,
REFRESH_LONGTEXT, false )
- set_description( N_("Marquee display") )
add_shortcut( "time" )
add_obsolete_string( "time-format" )
add_obsolete_string( "time-x" )
static const char *const ppsz_filter_options[] = {
"marquee", "x", "y", "position", "color", "size", "timeout", "refresh",
+ "opacity",
NULL
};
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
+
#define CREATE_VAR( stor, type, var ) \
p_sys->stor = var_CreateGet##type##Command( p_filter, var ); \
var_AddCallback( p_filter, var, MarqueeCallback, p_sys );
+ p_sys->b_need_update = true;
CREATE_VAR( i_xoff, Integer, "marq-x" );
CREATE_VAR( i_yoff, Integer, "marq-y" );
CREATE_VAR( i_timeout,Integer, "marq-timeout" );
- CREATE_VAR( i_refresh,Integer, "marq-refresh" );
- p_sys->i_refresh *= 1000;
+ p_sys->i_refresh = 1000 * var_CreateGetIntegerCommand( p_filter,
+ "marq-refresh" );
+ var_AddCallback( p_filter, "marq-refresh", MarqueeCallback, p_sys );
CREATE_VAR( i_pos, Integer, "marq-position" );
CREATE_VAR( psz_marquee, String, "marq-marquee" );
- CREATE_VAR( p_style->i_font_alpha, Integer, "marq-opacity" );
+ p_sys->p_style->i_font_alpha = 255 - var_CreateGetIntegerCommand( p_filter,
+ "marq-opacity" );
+ var_AddCallback( p_filter, "marq-opacity", MarqueeCallback, p_sys );
CREATE_VAR( p_style->i_font_color, Integer, "marq-color" );
CREATE_VAR( p_style->i_font_size, Integer, "marq-size" );
- p_sys->p_style->i_font_alpha = 255 - p_sys->p_style->i_font_alpha ;
-
/* Misc init */
p_filter->pf_sub_filter = Filter;
p_sys->last_time = 0;
- p_sys->b_need_update = true;
return VLC_SUCCESS;
}
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
- text_style_Delete( p_sys->p_style );
- free( p_sys->psz_marquee );
-
/* Delete the marquee variables */
#define DEL_VAR(var) \
var_DelCallback( p_filter, var, MarqueeCallback, p_sys ); \
var_Destroy( p_filter, var );
DEL_VAR( "marq-x" );
DEL_VAR( "marq-y" );
- DEL_VAR( "marq-marquee" );
DEL_VAR( "marq-timeout" );
+ DEL_VAR( "marq-refresh" );
DEL_VAR( "marq-position" );
- DEL_VAR( "marq-color" );
+ DEL_VAR( "marq-marquee" );
DEL_VAR( "marq-opacity" );
+ DEL_VAR( "marq-color" );
DEL_VAR( "marq-size" );
vlc_mutex_destroy( &p_sys->lock );
+ text_style_Delete( p_sys->p_style );
+ free( p_sys->psz_marquee );
free( p_sys );
}
goto out;
memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('T','E','X','T');
- fmt.i_aspect = 0;
+ fmt.i_chroma = VLC_CODEC_TEXT;
fmt.i_width = fmt.i_height = 0;
fmt.i_x_offset = 0;
fmt.i_y_offset = 0;
/* where to locate the string: */
if( p_sys->i_pos < 0 )
{ /* set to an absolute xy */
- p_spu->p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+ p_spu->p_region->i_align = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
p_spu->b_absolute = true;
}
else