X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Frss.c;h=8eef177220630dd8bde0f8792924646dd62b459e;hb=09af489c23a225c76820aa44cf39759dd86efd22;hp=5746e07665bef3434b57cca71885ea74af2c6269;hpb=536fc420a2e0103f0d682df0a83badc3379254f8;p=vlc diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c index 5746e07665..8eef177220 100644 --- a/modules/video_filter/rss.c +++ b/modules/video_filter/rss.c @@ -29,10 +29,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include "vlc_filter.h" @@ -46,6 +49,8 @@ #include "vlc_image.h" +#include + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -56,11 +61,13 @@ static subpicture_t *Filter( filter_t *, mtime_t ); static int FetchRSS( filter_t * ); static void FreeRSS( filter_t * ); -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"), +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"), @@ -111,7 +118,7 @@ struct filter_sys_t int i_ttl; time_t t_last_update; - vlc_bool_t b_images; + bool b_images; int i_title; int i_cur_feed; @@ -122,7 +129,7 @@ struct filter_sys_t #define MSG_TEXT N_("Feed URLs") #define MSG_LONGTEXT N_("RSS/Atom feed '|' (pipe) seperated URLs.") #define SPEED_TEXT N_("Speed of feeds") -#define SPEED_LONGTEXT N_("Speed of the RSS/Atom feeds in milliseconds (bigger is slower).") +#define SPEED_LONGTEXT N_("Speed of the RSS/Atom feeds in microseconds (bigger is slower).") #define LENGTH_TEXT N_("Max length") #define LENGTH_LONGTEXT N_("Maximum number of characters displayed on the " \ "screen." ) @@ -159,8 +166,8 @@ struct filter_sys_t #define TITLE_TEXT N_("Title display mode") #define TITLE_LONGTEXT N_("Title display mode. Default is 0 (hidden) if the feed has an image and feed images are enabled, 1 otherwise.") -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") }; @@ -170,8 +177,8 @@ enum title_modes { prepend_title, scroll_title }; -static int pi_title_modes[] = { default_title, hide_title, prepend_title, scroll_title }; -static const char *ppsz_title_modes[] = +static const int pi_title_modes[] = { default_title, hide_title, prepend_title, scroll_title }; +static const char *const ppsz_title_modes[] = { N_("Default"), N_("Don't show"), N_("Always visible"), N_("Scroll with feed") }; #define CFG_PREFIX "rss-" @@ -179,45 +186,45 @@ static const char *ppsz_title_modes[] = /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_capability( "sub filter", 0 ); - set_shortname( "RSS / Atom" ); - set_callbacks( CreateFilter, DestroyFilter ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_SUBPIC ); - add_string( CFG_PREFIX "urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE ); - - set_section( N_("Position"), NULL ); - add_integer( CFG_PREFIX "x", -1, 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", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE ); - change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); - - set_section( N_("Font"), NULL ); +vlc_module_begin () + set_capability( "sub filter", 1 ) + set_shortname( "RSS / Atom" ) + set_callbacks( CreateFilter, DestroyFilter ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_SUBPIC ) + add_string( CFG_PREFIX "urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, false ) + + 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 ) /* 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 ); - add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE ); + false ) + change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ) + add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false ) - set_section( N_("Misc"), NULL ); + set_section( N_("Misc"), NULL ) add_integer( CFG_PREFIX "speed", 100000, NULL, SPEED_TEXT, SPEED_LONGTEXT, - VLC_FALSE ); + false ) add_integer( CFG_PREFIX "length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, - VLC_FALSE ); - add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_FALSE ); - add_bool( CFG_PREFIX "images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, VLC_FALSE ); - add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, VLC_FALSE ); - change_integer_list( pi_title_modes, ppsz_title_modes, 0 ); - - set_description( _("RSS and Atom feed display") ); - add_shortcut( "rss" ); - add_shortcut( "atom" ); -vlc_module_end(); - -static const char *ppsz_filter_options[] = { + false ) + add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false ) + add_bool( CFG_PREFIX "images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, false ) + add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, false ) + change_integer_list( pi_title_modes, ppsz_title_modes, NULL ) + + set_description( N_("RSS and Atom feed display") ) + add_shortcut( "rss" ) + add_shortcut( "atom" ) +vlc_module_end () + +static const char *const ppsz_filter_options[] = { "urls", "x", "y", "position", "color", "size", "speed", "length", "ttl", "images", "title", NULL }; @@ -234,12 +241,9 @@ 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; - } - vlc_mutex_init( p_filter, &p_sys->lock ); + vlc_mutex_init( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock ); config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, @@ -256,9 +260,28 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_length = var_CreateGetInteger( p_filter, CFG_PREFIX "length" ); p_sys->i_ttl = __MAX( 0, var_CreateGetInteger( p_filter, CFG_PREFIX "ttl" ) ); p_sys->b_images = var_CreateGetBool( p_filter, CFG_PREFIX "images" ); - p_sys->psz_marquee = (char *)malloc( p_sys->i_length ); + + p_sys->psz_marquee = (char *)malloc( p_sys->i_length + 1 ); + if( p_sys->psz_marquee == NULL ) + { + vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys->psz_urls ); + free( p_sys ); + return VLC_ENOMEM; + } + p_sys->psz_marquee[p_sys->i_length] = '\0'; p_sys->p_style = malloc( sizeof( text_style_t )); + if( p_sys->p_style == NULL ) + { + free( p_sys->psz_marquee ); + vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys->psz_urls ); + free( p_sys ); + return VLC_ENOMEM; + } memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t )); p_sys->i_xoff = var_CreateGetInteger( p_filter, CFG_PREFIX "x" ); @@ -268,31 +291,48 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->p_style->i_font_color = var_CreateGetInteger( p_filter, CFG_PREFIX "color" ); p_sys->p_style->i_font_size = var_CreateGetInteger( p_filter, CFG_PREFIX "size" ); - if( p_sys->b_images == VLC_TRUE && p_sys->p_style->i_font_size == -1 ) + if( p_sys->b_images == true && p_sys->p_style->i_font_size == -1 ) { - msg_Warn( p_filter, "rrs-size wasn't specified. Feed images will thus be displayed without being resized" ); + msg_Warn( p_filter, "rss-size wasn't specified. Feed images will thus be displayed without being resized" ); } if( FetchRSS( p_filter ) ) { msg_Err( p_filter, "failed while fetching RSS ... too bad" ); + free( p_sys->p_style ); + free( p_sys->psz_marquee ); vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys->psz_urls ); + free( p_sys ); return VLC_EGENERIC; } p_sys->t_last_update = time( NULL ); if( p_sys->i_feeds == 0 ) { + free( p_sys->p_style ); + free( p_sys->psz_marquee ); vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys->psz_urls ); + free( p_sys ); return VLC_EGENERIC; } for( i_feed=0; i_feed < p_sys->i_feeds; i_feed ++ ) + { if( p_sys->p_feeds[i_feed].i_items == 0 ) { + free( p_sys->p_style ); + free( p_sys->psz_marquee ); + FreeRSS( p_filter ); vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys->psz_urls ); + free( p_sys ); return VLC_EGENERIC; } - + } /* Misc init */ p_filter->pf_sub_filter = Filter; p_sys->last_date = (mtime_t)0; @@ -311,8 +351,8 @@ static void DestroyFilter( vlc_object_t *p_this ) vlc_mutex_lock( &p_sys->lock ); - if( p_sys->p_style ) free( p_sys->p_style ); - if( p_sys->psz_marquee ) free( p_sys->psz_marquee ); + free( p_sys->p_style ); + free( p_sys->psz_marquee ); free( p_sys->psz_urls ); FreeRSS( p_filter ); vlc_mutex_unlock( &p_sys->lock ); @@ -343,14 +383,15 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) { filter_sys_t *p_sys = p_filter->p_sys; subpicture_t *p_spu; - video_format_t fmt = {0}; - + video_format_t fmt; subpicture_region_t *p_region; int i_feed, i_item; struct rss_feed_t *p_feed; + memset( &fmt, 0, sizeof(video_format_t) ); + vlc_mutex_lock( &p_sys->lock ); if( p_sys->last_date @@ -393,7 +434,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) } } - p_spu = p_filter->pf_sub_buffer_new( p_filter ); + p_spu = filter_NewSubpicture( p_filter ); if( !p_spu ) { vlc_mutex_unlock( &p_sys->lock ); @@ -402,7 +443,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt.i_chroma = VLC_FOURCC('T','E','X','T'); - 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 ); @@ -471,34 +512,33 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) } p_spu->p_region->psz_text = strdup(p_sys->psz_marquee); + if( p_sys->p_style->i_font_size > 0 ) + p_spu->p_region->fmt.i_visible_height = p_sys->p_style->i_font_size; p_spu->i_start = date; p_spu->i_stop = 0; - p_spu->b_ephemer = VLC_TRUE; + p_spu->b_ephemer = true; /* where to locate the string: */ - if( p_sys->i_xoff < 0 || p_sys->i_yoff < 0 ) - { /* set to one of the 9 relative locations */ - p_spu->i_flags = p_sys->i_pos; - p_spu->i_x = 0; - p_spu->i_y = 0; - p_spu->b_absolute = VLC_FALSE; + 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 = true; } else - { /* set to an absolute xy, referenced to upper left corner */ - 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; + { /* set to one of the 9 relative locations */ + p_spu->p_region->i_align = p_sys->i_pos; + p_spu->b_absolute = false; } - p_spu->i_height = 1; p_spu->p_region->p_style = p_sys->p_style; if( p_feed->p_pic ) { /* Display the feed's image */ picture_t *p_pic = p_feed->p_pic; - video_format_t fmt_out = {0}; + video_format_t fmt_out; + + memset( &fmt_out, 0, sizeof(video_format_t) ); fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); fmt_out.i_aspect = VOUT_ASPECT_FACTOR; @@ -508,14 +548,17 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt_out.i_height = fmt_out.i_visible_height = p_pic->p[Y_PLANE].i_visible_lines; - p_region = p_spu->pf_create_region( VLC_OBJECT( p_filter ), &fmt_out ); + p_region = subpicture_region_New( &fmt_out ); if( !p_region ) { msg_Err( p_filter, "cannot allocate SPU region" ); } else { - vout_CopyPicture( p_filter, &p_region->picture, p_pic ); + p_region->i_x = p_sys->i_xoff; + p_region->i_y = p_sys->i_yoff; + /* FIXME the copy is probably not needed anymore */ + picture_Copy( p_region->p_picture, p_pic ); p_spu->p_region->p_next = p_region; } @@ -542,11 +585,15 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) static picture_t *LoadImage( filter_t *p_filter, const char *psz_url ) { filter_sys_t *p_sys = p_filter->p_sys; - - video_format_t fmt_in={0}, fmt_out={0}; - picture_t *p_orig, *p_pic=NULL; + video_format_t fmt_in; + video_format_t fmt_out; + picture_t *p_orig; + picture_t *p_pic = NULL; image_handler_t *p_handler = image_HandlerCreate( p_filter ); + memset( &fmt_in, 0, sizeof(video_format_t) ); + memset( &fmt_out, 0, sizeof(video_format_t) ); + fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); p_orig = image_ReadUrl( p_handler, psz_url, &fmt_in, &fmt_out ); @@ -565,7 +612,7 @@ static picture_t *LoadImage( filter_t *p_filter, const char *psz_url ) fmt_out.i_height = p_sys->p_style->i_font_size; p_pic = image_Convert( p_handler, p_orig, &fmt_in, &fmt_out ); - p_orig->pf_release( p_orig ); + picture_Release( p_orig ); if( !p_pic ) { msg_Warn( p_filter, "Error while converting %s", psz_url ); @@ -626,8 +673,8 @@ static int FetchRSS( filter_t *p_filter) int i_feed; int i_item; - vlc_bool_t b_is_item; - vlc_bool_t b_is_image; + bool b_is_item; + bool b_is_image; int i_int; FreeRSS( p_filter ); @@ -683,8 +730,8 @@ static int FetchRSS( filter_t *p_filter) } i_item = 0; - b_is_item = VLC_FALSE; - b_is_image = VLC_FALSE; + b_is_item = false; + b_is_image = false; while( xml_ReaderRead( p_xml_reader ) == 1 ) { @@ -695,11 +742,7 @@ static int FetchRSS( filter_t *p_filter) return 1; case XML_READER_STARTELEM: - if( psz_eltname ) - { - free( psz_eltname ); - psz_eltname = NULL; - } + free( psz_eltname ); psz_eltname = xml_ReaderName( p_xml_reader ); if( !psz_eltname ) { @@ -711,7 +754,7 @@ static int FetchRSS( filter_t *p_filter) if( !strcmp( psz_eltname, "item" ) /* rss */ || !strcmp( psz_eltname, "entry" ) ) /* atom */ { - b_is_item = VLC_TRUE; + b_is_item = true; p_feed->i_items++; p_feed->p_items = (struct rss_item_t *)realloc( p_feed->p_items, p_feed->i_items * sizeof( struct rss_item_t ) ); p_feed->p_items[p_feed->i_items-1].psz_title = NULL; @@ -721,7 +764,7 @@ static int FetchRSS( filter_t *p_filter) } else if( !strcmp( psz_eltname, "image" ) ) /* rss */ { - b_is_image = VLC_TRUE; + b_is_image = true; } else if( !strcmp( psz_eltname, "link" ) ) /* atom */ { @@ -734,10 +777,20 @@ static int FetchRSS( filter_t *p_filter) char *psz_value = xml_ReaderValue( p_xml_reader ); if( !strcmp( psz_name, "rel" ) ) { + if( psz_rel ) + { + msg_Dbg( p_filter, "\"rel\" attribute of link atom duplicated (last value: %s)", psz_value ); + free( psz_rel ); + } psz_rel = psz_value; } else if( !strcmp( psz_name, "href" ) ) { + if( psz_href ) + { + msg_Dbg( p_filter, "\"href\" attribute of link atom duplicated (last value: %s)", psz_href ); + free( psz_href ); + } psz_href = psz_value; } else @@ -749,8 +802,8 @@ static int FetchRSS( filter_t *p_filter) if( psz_rel && psz_href ) { if( !strcmp( psz_rel, "alternate" ) - && b_is_item == VLC_FALSE - && b_is_image == VLC_FALSE + && b_is_item == false + && b_is_image == false && !p_feed->psz_link ) { p_feed->psz_link = psz_href; @@ -758,8 +811,8 @@ static int FetchRSS( filter_t *p_filter) /* this isn't in the rfc but i found some ... */ else if( ( !strcmp( psz_rel, "logo" ) || !strcmp( psz_rel, "icon" ) ) - && b_is_item == VLC_FALSE - && b_is_image == VLC_FALSE + && b_is_item == false + && b_is_image == false && !p_feed->psz_image ) { p_feed->psz_image = psz_href; @@ -771,18 +824,15 @@ static int FetchRSS( filter_t *p_filter) } else { - if( psz_href ) free( psz_href ); + free( psz_href ); } - if( psz_rel ) free( psz_rel ); + free( psz_rel ); } break; case XML_READER_ENDELEM: - if( psz_eltname ) - { - free( psz_eltname ); - psz_eltname = NULL; - } + free( psz_eltname ); + psz_eltname = NULL; psz_eltname = xml_ReaderName( p_xml_reader ); if( !psz_eltname ) { @@ -794,12 +844,12 @@ static int FetchRSS( filter_t *p_filter) if( !strcmp( psz_eltname, "item" ) /* rss */ || !strcmp( psz_eltname, "entry" ) ) /* atom */ { - b_is_item = VLC_FALSE; + b_is_item = false; i_item++; } else if( !strcmp( psz_eltname, "image" ) ) /* rss */ { - b_is_image = VLC_FALSE; + b_is_image = false; } free( psz_eltname ); psz_eltname = NULL; @@ -821,7 +871,7 @@ static int FetchRSS( filter_t *p_filter) # ifdef RSS_DEBUG msg_Dbg( p_filter, " text : <%s>", psz_eltvalue ); # endif - if( b_is_item == VLC_TRUE ) + if( b_is_item == true ) { struct rss_item_t *p_item; p_item = p_feed->p_items+i_item; @@ -847,7 +897,7 @@ static int FetchRSS( filter_t *p_filter) psz_eltvalue = NULL; } } - else if( b_is_image == VLC_TRUE ) + else if( b_is_image == true ) { if( !strcmp( psz_eltname, "url" ) /* rss */ && !p_feed->psz_image ) @@ -894,7 +944,7 @@ static int FetchRSS( filter_t *p_filter) } } - if( p_sys->b_images == VLC_TRUE + if( p_sys->b_images == true && p_feed->psz_image && !p_feed->p_pic ) { p_feed->p_pic = LoadImage( p_filter, p_feed->psz_image ); @@ -939,7 +989,7 @@ static void FreeRSS( filter_t *p_filter) free( p_feed->psz_description ); free( p_feed->psz_image ); if( p_feed->p_pic != NULL ) - p_feed->p_pic->pf_release( p_feed->p_pic ); + picture_Release( p_feed->p_pic ); } free( p_sys->p_feeds ); p_sys->i_feeds = 0;