X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmarq.c;h=7c102fb26a3ac94116caca1e27cb83972ea71633;hb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;hp=619c485f164a9908fbcab34ed9eb31f1055b0f3a;hpb=0f00164eb903cee76c89575ed26117332ed1ee99;p=vlc diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c index 619c485f16..7c102fb26a 100644 --- a/modules/video_filter/marq.c +++ b/modules/video_filter/marq.c @@ -31,7 +31,8 @@ # include "config.h" #endif -#include +#include +#include #include #include "vlc_filter.h" @@ -51,12 +52,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, +static const int pi_color_values[] = { + 0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000, 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF}; -static const char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"), - N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), N_("Red"), +static const char *const 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_("Aqua") }; @@ -77,7 +80,7 @@ struct filter_sys_t mtime_t last_time; mtime_t i_refresh; - vlc_bool_t b_need_update; + bool b_need_update; }; #define MSG_TEXT N_("Text") @@ -128,8 +131,8 @@ struct filter_sys_t "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ "also use combinations of these values, eg 6 = top-right).") -static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static const char *ppsz_pos_descriptions[] = +static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; +static const char *const ppsz_pos_descriptions[] = { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; @@ -138,49 +141,49 @@ static const char *ppsz_pos_descriptions[] = /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_capability( "sub filter", 0 ); - set_shortname( _("Marquee" )); - set_callbacks( CreateFilter, DestroyFilter ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_SUBPIC ); +vlc_module_begin () + set_capability( "sub filter", 0 ) + set_shortname( N_("Marquee" )) + set_callbacks( CreateFilter, DestroyFilter ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_SUBPIC ) add_string( CFG_PREFIX "marquee", "VLC", NULL, MSG_TEXT, MSG_LONGTEXT, - VLC_FALSE ); + false ) - set_section( N_("Position"), NULL ); - add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE ); - add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE ); - add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE ); - change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); + set_section( N_("Position"), NULL ) + add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true ) + add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true ) + add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false ) + change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); - set_section( N_("Font"), NULL ); + set_section( N_("Font"), NULL ) /* 5 sets the default to top [1] left [4] */ add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE ); + OPACITY_TEXT, OPACITY_LONGTEXT, false ) add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, - VLC_FALSE ); - change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); + false ) + change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, - VLC_FALSE ); + false ) - set_section( N_("Misc"), NULL ); + set_section( N_("Misc"), NULL ) add_integer( CFG_PREFIX "timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, - VLC_FALSE ); + false ) add_integer( CFG_PREFIX "refresh", 1000, NULL, REFRESH_TEXT, - REFRESH_LONGTEXT, VLC_FALSE ); - - set_description( _("Marquee display") ); - add_shortcut( "time" ); - add_obsolete_string( "time-format" ); - add_obsolete_string( "time-x" ); - add_obsolete_string( "time-y" ); - add_obsolete_string( "time-position" ); - add_obsolete_string( "time-opacity" ); - add_obsolete_string( "time-color" ); - add_obsolete_string( "time-size" ); -vlc_module_end(); - -static const char *ppsz_filter_options[] = { + REFRESH_LONGTEXT, false ) + + set_description( N_("Marquee display") ) + add_shortcut( "time" ) + add_obsolete_string( "time-format" ) + add_obsolete_string( "time-x" ) + add_obsolete_string( "time-y" ) + add_obsolete_string( "time-position" ) + add_obsolete_string( "time-opacity" ) + add_obsolete_string( "time-color" ) + add_obsolete_string( "time-size" ) +vlc_module_end () + +static const char *const ppsz_filter_options[] = { "marquee", "x", "y", "position", "color", "size", "timeout", "refresh", NULL }; @@ -196,10 +199,7 @@ static int CreateFilter( vlc_object_t *p_this ) /* Allocate structure */ p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } p_sys->p_style = malloc( sizeof( text_style_t ) ); memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t ) ); @@ -215,6 +215,7 @@ static int CreateFilter( vlc_object_t *p_this ) 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; CREATE_VAR( i_pos, Integer, "marq-position" ); CREATE_VAR( psz_marquee, String, "marq-marquee" ); CREATE_VAR( p_style->i_font_alpha, Integer, "marq-opacity" ); @@ -226,7 +227,7 @@ static int CreateFilter( vlc_object_t *p_this ) /* Misc init */ p_filter->pf_sub_filter = Filter; p_sys->last_time = 0; - p_sys->b_need_update = VLC_TRUE; + p_sys->b_need_update = true; return VLC_SUCCESS; } @@ -265,21 +266,19 @@ static void DestroyFilter( vlc_object_t *p_this ) static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) { filter_sys_t *p_sys = p_filter->p_sys; - subpicture_t *p_spu; + subpicture_t *p_spu = NULL; video_format_t fmt; - if( p_sys->last_time + p_sys->i_refresh*1000 > date ) - { + if( p_sys->last_time + p_sys->i_refresh > date ) return NULL; - } - if( p_sys->b_need_update == VLC_FALSE ) - { - return NULL; - } + vlc_object_lock( p_filter ); + if( p_sys->b_need_update == false ) + goto out; - p_spu = p_filter->pf_sub_buffer_new( p_filter ); - if( !p_spu ) return NULL; + p_spu = filter_NewSubpicture( p_filter ); + if( !p_spu ) + goto out; memset( &fmt, 0, sizeof(video_format_t) ); fmt.i_chroma = VLC_FOURCC('T','E','X','T'); @@ -287,45 +286,44 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt.i_width = fmt.i_height = 0; fmt.i_x_offset = 0; fmt.i_y_offset = 0; - p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_filter), &fmt ); + p_spu->p_region = subpicture_region_New( &fmt ); if( !p_spu->p_region ) { p_filter->pf_sub_buffer_del( p_filter, p_spu ); - return NULL; + p_spu = NULL; + goto out; } p_sys->last_time = date; - if( strchr( p_sys->psz_marquee, '%' ) || strchr( p_sys->psz_marquee, '$' ) ) - { - p_sys->b_need_update = VLC_TRUE; - } - else - { - p_sys->b_need_update = VLC_FALSE; - } + if( !strchr( p_sys->psz_marquee, '%' ) + && !strchr( p_sys->psz_marquee, '$' ) ) + p_sys->b_need_update = false; + p_spu->p_region->psz_text = str_format( p_filter, p_sys->psz_marquee ); p_spu->i_start = date; p_spu->i_stop = p_sys->i_timeout == 0 ? 0 : date + p_sys->i_timeout * 1000; - p_spu->b_ephemer = VLC_TRUE; + p_spu->b_ephemer = true; /* 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->b_absolute = VLC_TRUE; + p_spu->b_absolute = true; } else { /* set to one of the 9 relative locations */ p_spu->p_region->i_align = p_sys->i_pos; - p_spu->b_absolute = VLC_FALSE; + p_spu->b_absolute = false; } - p_spu->i_x = p_sys->i_xoff; - p_spu->i_y = p_sys->i_yoff; + p_spu->p_region->i_x = p_sys->i_xoff; + p_spu->p_region->i_y = p_sys->i_yoff; p_spu->p_region->p_style = p_sys->p_style; +out: + vlc_object_unlock( p_filter ); return p_spu; } @@ -336,9 +334,10 @@ static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - VLC_UNUSED(p_this); VLC_UNUSED(oldval); + VLC_UNUSED(oldval); filter_sys_t *p_sys = (filter_sys_t *) p_data; + vlc_object_lock( p_this ); if( !strncmp( psz_var, "marq-marquee", 7 ) ) { free( p_sys->psz_marquee ); @@ -370,7 +369,7 @@ static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var, } else if ( !strncmp( psz_var, "marq-refresh", 12 ) ) { - p_sys->i_refresh = newval.i_int; + p_sys->i_refresh = newval.i_int * 1000; } else if ( !strncmp( psz_var, "marq-position", 8 ) ) /* willing to accept a match against marq-pos */ @@ -378,6 +377,7 @@ static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_pos = newval.i_int; p_sys->i_xoff = -1; /* force to relative positioning */ } - p_sys->b_need_update = VLC_TRUE; + p_sys->b_need_update = true; + vlc_object_unlock( p_this ); return VLC_SUCCESS; }