X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Frss.c;h=36e34372f400ae65741e2c7c6e09642f5799f828;hb=f0a61cd7c0a711c1191239a8adf72e3de971b8b9;hp=663eb8c0efe4e756822ce273484747c96d03cc01;hpb=c4d8e42c76f54bc55b520ce9ce133d3be55d6012;p=vlc diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c index 663eb8c0ef..36e34372f4 100644 --- a/modules/video_filter/rss.c +++ b/modules/video_filter/rss.c @@ -1,10 +1,11 @@ /***************************************************************************** - * rss.c : rss feed display video plugin for vlc + * rss.c : rss/atom feed display video plugin for vlc ***************************************************************************** - * Copyright (C) 2003-2005 the VideoLAN team + * Copyright (C) 2003-2006 the VideoLAN team * $Id$ * - * Authors: Antoine Cellerier + * Authors: Antoine Cellerier + * Rémi Duraffort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,22 +22,33 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/***************************************************************************** + * Atom : http://www.ietf.org/rfc/rfc4287.txt + * RSS : http://www.rssboard.org/rss-specification + *****************************************************************************/ + /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include -#include "vlc_filter.h" -#include "vlc_block.h" -#include "vlc_osd.h" +#include +#include +#include -#include "vlc_block.h" -#include "vlc_stream.h" -#include "vlc_xml.h" +#include +#include +#include + +#include + +#include /***************************************************************************** * Local prototypes @@ -45,14 +57,19 @@ static int CreateFilter ( vlc_object_t * ); static void DestroyFilter( vlc_object_t * ); static subpicture_t *Filter( filter_t *, mtime_t ); -static int FetchRSS( filter_t * ); -static void FreeRSS( filter_t * ); +static struct rss_feed_t *FetchRSS( filter_t * ); +static void FreeRSS( struct rss_feed_t *, int ); +static int ParseUrls( filter_t *, char * ); -static int pi_color_values[] = { 0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0, +static void Fetch( void * ); + +static const 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 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"), @@ -62,27 +79,31 @@ static char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"), * filter_sys_t: rss filter descriptor *****************************************************************************/ -struct rss_item_t +typedef struct rss_item_t { char *psz_title; char *psz_description; char *psz_link; -}; +} rss_item_t; -struct rss_feed_t +typedef struct rss_feed_t { + char *psz_url; char *psz_title; char *psz_description; char *psz_link; + char *psz_image; + picture_t *p_pic; int i_items; - struct rss_item_t *p_items; -}; + rss_item_t *p_items; +} rss_feed_t; struct filter_sys_t { vlc_mutex_t lock; - vlc_mutex_t *p_lock; + vlc_timer_t timer; /* Timer to refresh the rss feeds */ + bool b_fetched; int i_xoff, i_yoff; /* offsets for the display string in the video window */ int i_pos; /* permit relative positioning (top, bottom, left, right, center) */ @@ -95,91 +116,119 @@ struct filter_sys_t mtime_t last_date; - char *psz_urls; int i_feeds; - struct rss_feed_t *p_feeds; + rss_feed_t *p_feeds; - int i_ttl; - time_t t_last_update; + bool b_images; + int i_title; int i_cur_feed; int i_cur_item; int i_cur_char; }; -#define MSG_TEXT N_("RSS feed URLs") -#define MSG_LONGTEXT N_("RSS feed '|' (pipe) seperated URLs") -#define SPEED_TEXT N_("RSS feed speed") -#define SPEED_LONGTEXT N_("RSS feed speed (bigger is slower)") -#define LENGTH_TEXT N_("RSS feed max number of chars displayed") -#define LENGTH_LONGTEXT N_("RSS feed max number of chars displayed") -#define TTL_TEXT N_("Number of seconds between each forced refresh of the feeds") -#define TTL_LONGTEXT N_("Number of seconds between each forced refresh of the feeds. If 0, the feeds will never be updated.") - - -#define POSX_TEXT N_("X offset, from left") -#define POSX_LONGTEXT N_("X offset, from the left screen edge" ) -#define POSY_TEXT N_("Y offset, from the top") -#define POSY_LONGTEXT N_("Y offset, down from the top" ) +#define MSG_TEXT N_("Feed URLs") +#define MSG_LONGTEXT N_("RSS/Atom feed '|' (pipe) separated URLs.") +#define SPEED_TEXT N_("Speed of feeds") +#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." ) +#define TTL_TEXT N_("Refresh time") +#define TTL_LONGTEXT N_("Number of seconds between each forced refresh " \ + "of the feeds. 0 means that the feeds are never updated." ) +#define IMAGE_TEXT N_("Feed images") +#define IMAGE_LONGTEXT N_("Display feed images if available.") + +#define POSX_TEXT N_("X offset") +#define POSX_LONGTEXT N_("X offset, from the left screen edge." ) +#define POSY_TEXT N_("Y offset") +#define POSY_LONGTEXT N_("Y offset, down from the top." ) #define OPACITY_TEXT N_("Opacity") -#define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of " \ - "overlay text. 0 = transparent, 255 = totally opaque. " ) +#define OPACITY_LONGTEXT N_("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" ) +#define SIZE_LONGTEXT N_("Font size, in pixels. Default is -1 (use default " \ + "font size)." ) -#define COLOR_TEXT N_("Text Default Color") -#define COLOR_LONGTEXT N_("The color of overlay text. 1 byte for each color, hexadecimal. " \ - "#000000 = all colors off, " \ - "0xFF0000 = just Red, 0xFFFFFF = all color on [White]" ) +#define COLOR_TEXT N_("Color") +#define COLOR_LONGTEXT N_("Color of the text that will be rendered on "\ + "the video. This must be an hexadecimal (like HTML colors). The first two "\ + "chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\ + " #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" ) -#define POS_TEXT N_("Marquee position") +#define POS_TEXT N_("Text position") #define POS_LONGTEXT N_( \ - "You can enforce the marquee position on the video " \ - "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ - "also use combinations of these values by adding them).") + "You can enforce the text position on the video " \ + "(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 char *ppsz_pos_descriptions[] = +#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 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") }; +enum title_modes { + default_title=-1, + hide_title, + prepend_title, + scroll_title }; + +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-" + /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_capability( "sub filter", 0 ); - set_shortname( "RSS" ); - set_callbacks( CreateFilter, DestroyFilter ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_SUBPIC ); - add_string( "rss-urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE ); - - set_section( N_("Position"), NULL ); - add_integer( "rss-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE ); - add_integer( "rss-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE ); - add_integer( "rss-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", NULL, 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( "rss-opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE ); - add_integer( "rss-color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, - VLC_FALSE ); - change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); - add_integer( "rss-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE ); - - set_section( N_("Misc"), NULL ); - add_integer( "rss-speed", 100000, NULL, SPEED_TEXT, SPEED_LONGTEXT, - VLC_FALSE ); - add_integer( "rss-length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, - VLC_FALSE ); - add_integer( "rss-ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_FALSE ); - - set_description( _("RSS feed display") ); - add_shortcut( "rss" ); -vlc_module_end(); + add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL, + OPACITY_TEXT, OPACITY_LONGTEXT, false ) + add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, + 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 ) + add_integer( CFG_PREFIX "speed", 100000, NULL, SPEED_TEXT, SPEED_LONGTEXT, + false ) + add_integer( CFG_PREFIX "length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, + false ) + add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false ) + add_bool( CFG_PREFIX "images", true, 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 +}; /***************************************************************************** * CreateFilter: allocates RSS video filter @@ -188,67 +237,93 @@ static int CreateFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys; - int i_feed; + char *psz_urls; + int i_ttl; /* 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_lock( &p_sys->lock ); + config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, + p_filter->p_cfg ); - p_sys->psz_urls = var_CreateGetString( p_filter, "rss-urls" ); + /* Get the urls to parse: must be non empty */ + psz_urls = var_CreateGetNonEmptyString( p_filter, CFG_PREFIX "urls" ); + if( !psz_urls ) + { + msg_Err( p_filter, "The list of urls must not be empty" ); + free( p_sys ); + return VLC_EGENERIC; + } + + /* Fill the p_sys structure with the configuration */ + p_sys->i_title = var_CreateGetInteger( p_filter, CFG_PREFIX "title" ); p_sys->i_cur_feed = 0; - p_sys->i_cur_item = 0; + p_sys->i_cur_item = p_sys->i_title == scroll_title ? -1 : 0; p_sys->i_cur_char = 0; p_sys->i_feeds = 0; p_sys->p_feeds = NULL; - p_sys->i_speed = var_CreateGetInteger( p_filter, "rss-speed" ); - p_sys->i_length = var_CreateGetInteger( p_filter, "rss-length" ); - p_sys->i_ttl = __MAX( 0, var_CreateGetInteger( p_filter, "rss-ttl" ) ); - p_sys->psz_marquee = (char *)malloc( p_sys->i_length ); - - p_sys->p_style = malloc( sizeof( text_style_t )); - memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t )); - - p_sys->i_xoff = var_CreateGetInteger( p_filter, "rss-x" ); - p_sys->i_yoff = var_CreateGetInteger( p_filter, "rss-y" ); - p_sys->i_pos = var_CreateGetInteger( p_filter, "rss-position" ); - p_sys->p_style->i_font_alpha = 255 - var_CreateGetInteger( p_filter, "rss-opacity" ); - p_sys->p_style->i_font_color = var_CreateGetInteger( p_filter, "rss-color" ); - p_sys->p_style->i_font_size = var_CreateGetInteger( p_filter, "rss-size" ); - - if( FetchRSS( p_filter ) ) + p_sys->i_speed = var_CreateGetInteger( p_filter, CFG_PREFIX "speed" ); + p_sys->i_length = var_CreateGetInteger( p_filter, CFG_PREFIX "length" ); + p_sys->b_images = var_CreateGetBool( p_filter, CFG_PREFIX "images" ); + + i_ttl = __MAX( 0, var_CreateGetInteger( p_filter, CFG_PREFIX "ttl" ) ); + + p_sys->psz_marquee = malloc( p_sys->i_length + 1 ); + if( p_sys->psz_marquee == NULL ) { - msg_Err( p_filter, "failed while fetching RSS ... too bad" ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_EGENERIC; + free( psz_urls ); + free( p_sys ); + return VLC_ENOMEM; } - p_sys->t_last_update = time( NULL ); + p_sys->psz_marquee[p_sys->i_length] = '\0'; + + p_sys->p_style = text_style_New(); + if( p_sys->p_style == NULL ) + goto error; - if( p_sys->i_feeds == 0 ) + p_sys->i_xoff = var_CreateGetInteger( p_filter, CFG_PREFIX "x" ); + p_sys->i_yoff = var_CreateGetInteger( p_filter, CFG_PREFIX "y" ); + p_sys->i_pos = var_CreateGetInteger( p_filter, CFG_PREFIX "position" ); + p_sys->p_style->i_font_alpha = 255 - var_CreateGetInteger( p_filter, CFG_PREFIX "opacity" ); + 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 && p_sys->p_style->i_font_size == -1 ) { - vlc_mutex_unlock( &p_sys->lock ); - return VLC_EGENERIC; + msg_Warn( p_filter, "rss-size wasn't specified. Feed images will thus be displayed without being resized" ); } - for( i_feed=0; i_feed < p_sys->i_feeds; i_feed ++ ) - if( p_sys->p_feeds[i_feed].i_items == 0 ) - { - vlc_mutex_unlock( &p_sys->lock ); - return VLC_EGENERIC; - } + + /* Parse the urls */ + if( ParseUrls( p_filter, psz_urls ) ) + goto error; /* Misc init */ + vlc_mutex_init( &p_sys->lock ); p_filter->pf_sub_filter = Filter; p_sys->last_date = (mtime_t)0; + p_sys->b_fetched = false; - vlc_mutex_unlock( &p_sys->lock ); + /* Create and arm the timer */ + if( vlc_timer_create( &p_sys->timer, Fetch, p_filter ) ) + { + vlc_mutex_destroy( &p_sys->lock ); + goto error; + } + vlc_timer_schedule( p_sys->timer, false, 1, + (mtime_t)(i_ttl)*1000000 ); + free( psz_urls ); return VLC_SUCCESS; + +error: + if( p_sys->p_style ) + text_style_Delete( p_sys->p_style ); + free( p_sys->psz_marquee ); + free( psz_urls ); + free( p_sys ); + return VLC_ENOMEM; } /***************************************************************************** * DestroyFilter: destroy RSS video filter @@ -258,27 +333,13 @@ static void DestroyFilter( vlc_object_t *p_this ) filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys = p_filter->p_sys; - 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->psz_urls ); - FreeRSS( p_filter ); - vlc_mutex_unlock( &p_sys->lock ); + vlc_timer_destroy( p_sys->timer ); vlc_mutex_destroy( &p_sys->lock ); - free( p_sys ); - /* Delete the RSS variables */ - var_Destroy( p_filter, "rss-urls" ); - var_Destroy( p_filter, "rss-speed" ); - var_Destroy( p_filter, "rss-length" ); - var_Destroy( p_filter, "rss-ttl" ); - var_Destroy( p_filter, "rss-x" ); - var_Destroy( p_filter, "rss-y" ); - var_Destroy( p_filter, "rss-position" ); - var_Destroy( p_filter, "rss-color"); - var_Destroy( p_filter, "rss-opacity"); - var_Destroy( p_filter, "rss-size"); + text_style_Delete( p_sys->p_style ); + free( p_sys->psz_marquee ); + FreeRSS( p_sys->p_feeds, p_sys->i_feeds ); + free( p_sys ); } /**************************************************************************** @@ -291,63 +352,58 @@ 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; + subpicture_region_t *p_region; int i_feed, i_item; + rss_feed_t *p_feed; + + memset( &fmt, 0, sizeof(video_format_t) ); vlc_mutex_lock( &p_sys->lock ); - if( p_sys->last_date - + ( p_sys->i_cur_char == 0 && p_sys->i_cur_item == 0 ? 5 : 1 ) - /* ( ... ? 5 : 1 ) means "wait more for the 1st char" */ - * p_sys->i_speed > date ) + /* Check if the feeds have been fetched and that we have some feeds */ + /* TODO: check that we have items for each feeds */ + if( !p_sys->b_fetched && p_sys->i_feeds > 0 ) { vlc_mutex_unlock( &p_sys->lock ); return NULL; } - /* Do we need to update the feeds ? */ - if( p_sys->i_ttl - && time( NULL ) > p_sys->t_last_update + (time_t)p_sys->i_ttl ) + if( p_sys->last_date + + ( p_sys->i_cur_char == 0 && p_sys->i_cur_item == ( p_sys->i_title == scroll_title ? -1 : 0 ) ? 5 : 1 ) + /* ( ... ? 5 : 1 ) means "wait 5 times more for the 1st char" */ + * p_sys->i_speed > date ) { - msg_Dbg( p_filter, "Forcing update of all the RSS feeds" ); - if( FetchRSS( p_filter ) ) - { - msg_Err( p_filter, "failed while fetching RSS ... too bad" ); - vlc_mutex_unlock( &p_sys->lock ); - return NULL; /* FIXME : we most likely messed up all the data, - * so we might need to do something about it */ - } - p_sys->t_last_update = time( NULL ); + vlc_mutex_unlock( &p_sys->lock ); + return NULL; } p_sys->last_date = date; p_sys->i_cur_char++; - if( p_sys->p_feeds[p_sys->i_cur_feed].p_items[p_sys->i_cur_item].psz_title[p_sys->i_cur_char] == 0 ) + if( p_sys->i_cur_item == -1 ? p_sys->p_feeds[p_sys->i_cur_feed].psz_title[p_sys->i_cur_char] == 0 : p_sys->p_feeds[p_sys->i_cur_feed].p_items[p_sys->i_cur_item].psz_title[p_sys->i_cur_char] == 0 ) { p_sys->i_cur_char = 0; p_sys->i_cur_item++; if( p_sys->i_cur_item >= p_sys->p_feeds[p_sys->i_cur_feed].i_items ) { - p_sys->i_cur_item = 0; + if( p_sys->i_title == scroll_title ) + p_sys->i_cur_item = -1; + else + p_sys->i_cur_item = 0; p_sys->i_cur_feed = (p_sys->i_cur_feed + 1)%p_sys->i_feeds; } } - 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 ); return NULL; } - memset( &fmt, 0, sizeof(video_format_t) ); - fmt.i_chroma = VLC_FOURCC('T','E','X','T'); - fmt.i_aspect = 0; - fmt.i_width = 0; - 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 ); + fmt.i_chroma = VLC_CODEC_TEXT; + + p_spu->p_region = subpicture_region_New( &fmt ); if( !p_spu->p_region ) { p_filter->pf_sub_buffer_del( p_filter, p_spu ); @@ -355,38 +411,120 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) return NULL; } + /* Generate the string that will be displayed. This string is supposed to + be p_sys->i_length characters long. */ i_item = p_sys->i_cur_item; i_feed = p_sys->i_cur_feed; - snprintf( p_sys->psz_marquee, p_sys->i_length, "%s : %s", p_sys->p_feeds[i_feed].psz_title, p_sys->p_feeds[i_feed].p_items[i_item].psz_title+p_sys->i_cur_char ); + p_feed = &p_sys->p_feeds[i_feed]; + + if( ( p_feed->p_pic && p_sys->i_title == default_title ) + || p_sys->i_title == hide_title ) + { + /* Don't display the feed's title if we have an image */ + snprintf( p_sys->psz_marquee, p_sys->i_length, "%s", + p_sys->p_feeds[i_feed].p_items[i_item].psz_title + +p_sys->i_cur_char ); + } + else if( ( !p_feed->p_pic && p_sys->i_title == default_title ) + || p_sys->i_title == prepend_title ) + { + snprintf( p_sys->psz_marquee, p_sys->i_length, "%s : %s", + p_sys->p_feeds[i_feed].psz_title, + p_sys->p_feeds[i_feed].p_items[i_item].psz_title + +p_sys->i_cur_char ); + } + else /* scrolling title */ + { + if( i_item == -1 ) + snprintf( p_sys->psz_marquee, p_sys->i_length, "%s : %s", + p_sys->p_feeds[i_feed].psz_title + p_sys->i_cur_char, + p_sys->p_feeds[i_feed].p_items[i_item+1].psz_title ); + else + snprintf( p_sys->psz_marquee, p_sys->i_length, "%s", + p_sys->p_feeds[i_feed].p_items[i_item].psz_title + +p_sys->i_cur_char ); + } + while( strlen( p_sys->psz_marquee ) < (unsigned int)p_sys->i_length ) { i_item++; if( i_item == p_sys->p_feeds[i_feed].i_items ) break; - snprintf( strchr( p_sys->psz_marquee, 0 ), p_sys->i_length - strlen( p_sys->psz_marquee ), " - %s", p_sys->p_feeds[i_feed].p_items[i_item].psz_title ); + snprintf( strchr( p_sys->psz_marquee, 0 ), + p_sys->i_length - strlen( p_sys->psz_marquee ), + " - %s", + p_sys->p_feeds[i_feed].p_items[i_item].psz_title ); + } + + /* Calls to snprintf might split multibyte UTF8 chars ... + * which freetype doesn't like. */ + { + char *a = strdup( p_sys->psz_marquee ); + char *a2 = a; + char *b = p_sys->psz_marquee; + EnsureUTF8( p_sys->psz_marquee ); + /* we want to use ' ' instead of '?' for erroneous chars */ + while( *b != '\0' ) + { + if( *b != *a ) *b = ' '; + b++;a++; + } + free( a2 ); } 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->p_region->p_style = text_style_Duplicate( 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; + + memset( &fmt_out, 0, sizeof(video_format_t) ); + + fmt_out.i_chroma = VLC_CODEC_YUVA; + fmt_out.i_aspect = VOUT_ASPECT_FACTOR; + fmt_out.i_sar_num = fmt_out.i_sar_den = 1; + fmt_out.i_width = + fmt_out.i_visible_width = p_pic->p[Y_PLANE].i_visible_pitch; + fmt_out.i_height = + fmt_out.i_visible_height = p_pic->p[Y_PLANE].i_visible_lines; + + p_region = subpicture_region_New( &fmt_out ); + if( !p_region ) + { + msg_Err( p_filter, "cannot allocate SPU region" ); + } + else + { + 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; + } + + /* Offset text to display right next to the image */ + p_spu->p_region->i_x = p_pic->p[Y_PLANE].i_visible_pitch; } - p_spu->i_height = 1; - p_spu->p_region->p_style = p_sys->p_style; vlc_mutex_unlock( &p_sys->lock ); return p_spu; @@ -399,17 +537,67 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) * functions ***************************************************************************/ +#undef LoadImage /* do not conflict with Win32 API */ + +/**************************************************************************** + * download and resize image located at psz_url + ***************************************************************************/ +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; + 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_CODEC_YUVA; + p_orig = image_ReadUrl( p_handler, psz_url, &fmt_in, &fmt_out ); + + if( !p_orig ) + { + msg_Warn( p_filter, "Unable to read image %s", psz_url ); + } + else if( p_sys->p_style->i_font_size > 0 ) + { + + fmt_in.i_chroma = VLC_CODEC_YUVA; + fmt_in.i_height = p_orig->p[Y_PLANE].i_visible_lines; + fmt_in.i_width = p_orig->p[Y_PLANE].i_visible_pitch; + fmt_out.i_width = p_orig->p[Y_PLANE].i_visible_pitch + *p_sys->p_style->i_font_size/p_orig->p[Y_PLANE].i_visible_lines; + fmt_out.i_height = p_sys->p_style->i_font_size; + + p_pic = image_Convert( p_handler, p_orig, &fmt_in, &fmt_out ); + picture_Release( p_orig ); + if( !p_pic ) + { + msg_Warn( p_filter, "Error while converting %s", psz_url ); + } + } + else + { + p_pic = p_orig; + } + + image_HandlerDelete( p_handler ); + + return p_pic; +} /**************************************************************************** * remove all ' ' '\t' '\n' '\r' characters from the begining and end of the * string. ***************************************************************************/ -char *removeWhiteChars( char *psz_src ) +static char *removeWhiteChars( const char *psz_src ) { - char *psz_src2 = strdup( psz_src ); - char *psz_clean = strdup( psz_src2 ); - char *psz_clean2; + char *psz_src2,*psz_clean, *psz_clean2; + psz_src2 = psz_clean = strdup( psz_src ); int i; + while( ( *psz_clean == ' ' || *psz_clean == '\t' || *psz_clean == '\n' || *psz_clean == '\r' ) && *psz_clean != '\0' ) @@ -426,228 +614,387 @@ char *removeWhiteChars( char *psz_src ) return psz_clean2; } + /**************************************************************************** - * FetchRSS + * Parse url list, psz_urls must be non empty (TODO: check it !) ***************************************************************************/ -static int FetchRSS( filter_t *p_filter) +static int ParseUrls( filter_t *p_filter, char *psz_urls ) { filter_sys_t *p_sys = p_filter->p_sys; + char *psz_urls2 = psz_urls; - stream_t *p_stream = NULL; - xml_t *p_xml = NULL; - xml_reader_t *p_xml_reader = NULL; - - char *psz_eltname = NULL; - char *psz_eltvalue = NULL; - char *psz_feed = NULL; - char *psz_buffer = NULL; - char *psz_buffer_2 = NULL; - - int i_feed; - int i_item; - int i_is_item; - int i_int; - - FreeRSS( p_filter ); p_sys->i_feeds = 1; - i_int = 0; - while( p_sys->psz_urls[i_int] != 0 ) - if( p_sys->psz_urls[i_int++] == '|' ) - p_sys->i_feeds++; - p_sys->p_feeds = (struct rss_feed_t *)malloc( p_sys->i_feeds - * sizeof( struct rss_feed_t ) ); - p_xml = xml_Create( p_filter ); - if( !p_xml ) + /* Count the number of feeds */ + while( *psz_urls ) { - msg_Err( p_filter, "Failed to open XML parser" ); - return 1; + if( *psz_urls == '|' ) + p_sys->i_feeds++; + psz_urls++; } - psz_buffer = strdup( p_sys->psz_urls ); - psz_buffer_2 = psz_buffer; /* keep track so we can free it */ - for( i_feed = 0; i_feed < p_sys->i_feeds; i_feed++ ) + /* Allocate the structure */ + p_sys->p_feeds = malloc( p_sys->i_feeds * sizeof( rss_feed_t ) ); + if( !p_sys->p_feeds ) + return VLC_ENOMEM; + + /* Loop on all urls and fill in the struct */ + psz_urls = psz_urls2; + for( int i = 0; i < p_sys->i_feeds; i++ ) { - struct rss_feed_t *p_feed = p_sys->p_feeds+i_feed; + rss_feed_t* p_feed = p_sys->p_feeds + i; + char *psz_end; - if( psz_buffer == NULL ) break; - if( psz_buffer[0] == 0 ) psz_buffer++; - psz_feed = psz_buffer; - psz_buffer = strchr( psz_buffer, '|' ); - if( psz_buffer != NULL ) psz_buffer[0] = 0; + if( i < p_sys->i_feeds - 1 ) + { + psz_end = strchr( psz_urls, '|' ); + *psz_end = '\0'; + } + else + psz_end = psz_urls; - p_feed->psz_title = NULL; - p_feed->psz_description = NULL; - p_feed->psz_link = NULL; p_feed->i_items = 0; p_feed->p_items = NULL; + p_feed->psz_title = NULL; + p_feed->psz_link = NULL; + p_feed->psz_description = NULL; + p_feed->psz_image = NULL; + p_feed->p_pic = NULL; + p_feed->psz_url = strdup( psz_urls ); - msg_Dbg( p_filter, "Opening %s RSS feed ...", psz_feed ); + psz_urls = psz_end + 1; + } - p_stream = stream_UrlNew( p_filter, psz_feed ); - if( !p_stream ) - { - msg_Err( p_filter, "Failed to open %s for reading", psz_feed ); - return 1; - } + return VLC_SUCCESS; +} - p_xml_reader = xml_ReaderCreate( p_xml, p_stream ); - if( !p_xml_reader ) - { - msg_Err( p_filter, "Failed to open %s for parsing", psz_feed ); - return 1; - } - i_item = 0; - i_is_item = VLC_FALSE; - while( xml_ReaderRead( p_xml_reader ) == 1 ) - { - switch( xml_ReaderNodeType( p_xml_reader ) ) - { - // Error - case -1: - return 1; +/**************************************************************************** + * Parse the rss feed + ***************************************************************************/ +static bool ParseFeed( filter_t *p_filter, xml_reader_t *p_xml_reader, + rss_feed_t *p_feed ) +{ + VLC_UNUSED(p_filter); + char *psz_eltname = NULL; - case XML_READER_STARTELEM: - if( psz_eltname ) - { - free( psz_eltname ); - psz_eltname = NULL; - } - psz_eltname = xml_ReaderName( p_xml_reader ); - if( !psz_eltname ) - { - return 1; - } -# ifdef RSS_DEBUG - msg_Dbg( p_filter, "element name : %s", psz_eltname ); -# endif - if( !strcmp( psz_eltname, "item" ) ) - { - i_is_item = VLC_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; - p_feed->p_items[p_feed->i_items-1].psz_description - = NULL; - p_feed->p_items[p_feed->i_items-1].psz_link = NULL; - } - break; + bool b_is_item = false; + bool b_is_image = false; - case XML_READER_ENDELEM: - if( psz_eltname ) - { - free( psz_eltname ); - psz_eltname = NULL; - } - psz_eltname = xml_ReaderName( p_xml_reader ); - if( !psz_eltname ) + int i_item = 0; + + while( xml_ReaderRead( p_xml_reader ) == 1 ) + { + switch( xml_ReaderNodeType( p_xml_reader ) ) + { + // Error + case -1: + goto end; + + case XML_READER_STARTELEM: + free( psz_eltname ); + psz_eltname = xml_ReaderName( p_xml_reader ); + if( !psz_eltname ) + goto end; + +#ifdef RSS_DEBUG + msg_Dbg( p_filter, "element name: %s", psz_eltname ); +#endif + /* rss or atom */ + if( !strcmp( psz_eltname, "item" ) || !strcmp( psz_eltname, "entry" ) ) + { + b_is_item = true; + p_feed->i_items++; + p_feed->p_items = xrealloc( p_feed->p_items, + p_feed->i_items * sizeof( rss_item_t ) ); + p_feed->p_items[p_feed->i_items-1].psz_title = NULL; + p_feed->p_items[p_feed->i_items-1].psz_description = NULL; + p_feed->p_items[p_feed->i_items-1].psz_link = NULL; + } + /* rss */ + else if( !strcmp( psz_eltname, "image" ) ) + { + b_is_image = true; + } + /* atom */ + else if( !strcmp( psz_eltname, "link" ) ) + { + char *psz_href = NULL; + char *psz_rel = NULL; + while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS ) + { + char *psz_name = xml_ReaderName( p_xml_reader ); + char *psz_value = xml_ReaderValue( p_xml_reader ); + if( !strcmp( psz_name, "rel" ) ) { - return 1; + free( psz_rel ); + psz_rel = psz_value; } -# ifdef RSS_DEBUG - msg_Dbg( p_filter, "element end : %s", psz_eltname ); -# endif - if( !strcmp( psz_eltname, "item" ) ) + else if( !strcmp( psz_name, "href" ) ) { - i_is_item = VLC_FALSE; - i_item++; + free( psz_href ); + psz_href = psz_value; } - free( psz_eltname ); - psz_eltname = NULL; - break; - - case XML_READER_TEXT: - psz_eltvalue = xml_ReaderValue( p_xml_reader ); - if( !psz_eltvalue ) + else { - return 1; + free( psz_value ); } - else + free( psz_name ); + } + + /* "rel" and "href" must be defined */ + if( psz_rel && psz_href ) + { + if( !strcmp( psz_rel, "alternate" ) && !b_is_item && + !b_is_image && !p_feed->psz_link ) { - char *psz_clean; - psz_clean = removeWhiteChars( psz_eltvalue ); - free( psz_eltvalue ); psz_eltvalue = psz_clean; + p_feed->psz_link = psz_href; } -# ifdef RSS_DEBUG - msg_Dbg( p_filter, " text : <%s>", psz_eltvalue ); -# endif - if( i_is_item == VLC_FALSE ) + /* this isn't in the rfc but i found some ... */ + else if( ( !strcmp( psz_rel, "logo" ) || + !strcmp( psz_rel, "icon" ) ) + && !b_is_item && !b_is_image + && !p_feed->psz_image ) { - if( !strcmp( psz_eltname, "title" ) ) - { - p_feed->psz_title = psz_eltvalue; - } - else if( !strcmp( psz_eltname, "link" ) ) - { - p_feed->psz_link = psz_eltvalue; - } - else if( !strcmp( psz_eltname, "description" ) ) - { - p_feed->psz_description = psz_eltvalue; - } - else - { - free( psz_eltvalue ); - psz_eltvalue = NULL; - } + p_feed->psz_image = psz_href; } else { - struct rss_item_t *p_item; - p_item = p_feed->p_items+i_item; - if( !strcmp( psz_eltname, "title" ) ) - { - p_item->psz_title = psz_eltvalue; - } - else if( !strcmp( psz_eltname, "link" ) ) - { - p_item->psz_link = psz_eltvalue; - } - else if( !strcmp( psz_eltname, "description" ) ) - { - p_item->psz_description = psz_eltvalue; - } - else - { - free( psz_eltvalue ); - psz_eltvalue = NULL; - } + free( psz_href ); } - break; + } + else + { + free( psz_href ); + } + free( psz_rel ); } - } + break; + + case XML_READER_ENDELEM: + free( psz_eltname ); + psz_eltname = xml_ReaderName( p_xml_reader ); + if( !psz_eltname ) + goto end; + +#ifdef RSS_DEBUG + msg_Dbg( p_filter, "element end : %s", psz_eltname ); +#endif + /* rss or atom */ + if( !strcmp( psz_eltname, "item" ) || !strcmp( psz_eltname, "entry" ) ) + { + b_is_item = false; + i_item++; + } + /* rss */ + else if( !strcmp( psz_eltname, "image" ) ) + { + b_is_image = false; + } + FREENULL( psz_eltname ); + break; - if( p_xml_reader && p_xml ) xml_ReaderDelete( p_xml, p_xml_reader ); - if( p_stream ) stream_Delete( p_stream ); - msg_Dbg( p_filter, "Done with %s RSS feed.", psz_feed ); + case XML_READER_TEXT: + { + if( !psz_eltname ) + break; + char *psz_eltvalue = xml_ReaderValue( p_xml_reader ); + if( !psz_eltvalue ) + goto end; + + char *psz_clean = removeWhiteChars( psz_eltvalue ); + free( psz_eltvalue ); + psz_eltvalue = psz_clean; + +#ifdef RSS_DEBUG + msg_Dbg( p_filter, " text : <%s>", psz_eltvalue ); +#endif + /* Is it an item ? */ + if( b_is_item ) + { + rss_item_t *p_item = p_feed->p_items+i_item; + /* rss/atom */ + if( !strcmp( psz_eltname, "title" ) && !p_item->psz_title ) + { + p_item->psz_title = psz_eltvalue; + } + else if( !strcmp( psz_eltname, "link" ) /* rss */ + && !p_item->psz_link ) + { + p_item->psz_link = psz_eltvalue; + } + /* rss/atom */ + else if( ( !strcmp( psz_eltname, "description" ) || + !strcmp( psz_eltname, "summary" ) ) + && !p_item->psz_description ) + { + p_item->psz_description = psz_eltvalue; + } + else + { + free( psz_eltvalue ); + } + } + /* Is it an image ? */ + else if( b_is_image ) + { + if( !strcmp( psz_eltname, "url" ) && !p_feed->psz_image ) + p_feed->psz_image = psz_eltvalue; + else + free( psz_eltvalue ); + } + else + { + /* rss/atom */ + if( !strcmp( psz_eltname, "title" ) && !p_feed->psz_title ) + { + p_feed->psz_title = psz_eltvalue; + } + /* rss */ + else if( !strcmp( psz_eltname, "link" ) && !p_feed->psz_link ) + { + p_feed->psz_link = psz_eltvalue; + } + /* rss ad atom */ + else if( ( !strcmp( psz_eltname, "description" ) || + !strcmp( psz_eltname, "subtitle" ) ) + && !p_feed->psz_description ) + { + p_feed->psz_description = psz_eltvalue; + } + /* rss */ + else if( ( !strcmp( psz_eltname, "logo" ) || + !strcmp( psz_eltname, "icon" ) ) + && !p_feed->psz_image ) + { + p_feed->psz_image = psz_eltvalue; + } + else + { + free( psz_eltvalue ); + } + } + break; + } + } } - free( psz_buffer_2 ); - if( p_xml ) xml_Delete( p_xml ); - return 0; + free( psz_eltname ); + return true; + +end: + free( psz_eltname ); + return false; } + /**************************************************************************** - * FreeRSS + * FetchRSS (or Atom) feeds ***************************************************************************/ -static void FreeRSS( filter_t *p_filter) +static rss_feed_t* FetchRSS( filter_t *p_filter ) { filter_sys_t *p_sys = p_filter->p_sys; - struct rss_item_t *p_item; - struct rss_feed_t *p_feed; - + stream_t *p_stream; + xml_t *p_xml; + xml_reader_t *p_xml_reader; int i_feed; - int i_item; - for( i_feed = 0; i_feed < p_sys->i_feeds; i_feed++ ) + /* These data are not modified after the creation of the module so we don't + need to hold the lock */ + int i_feeds = p_sys->i_feeds; + bool b_images = p_sys->b_images; + + /* Allocate a new structure */ + rss_feed_t *p_feeds = malloc( i_feeds * sizeof( rss_feed_t ) ); + if( !p_feeds ) + return NULL; + + p_xml = xml_Create( p_filter ); + if( !p_xml ) + { + msg_Err( p_filter, "Failed to open XML parser" ); + free( p_feeds ); + return NULL; + } + + /* Fetch all feeds and parse them */ + for( i_feed = 0; i_feed < i_feeds; i_feed++ ) + { + rss_feed_t *p_feed = p_feeds + i_feed; + rss_feed_t *p_old_feed = p_sys->p_feeds + i_feed; + + /* Initialize the structure */ + p_feed->psz_title = NULL; + p_feed->psz_description = NULL; + p_feed->psz_link = NULL; + p_feed->psz_image = NULL; + p_feed->p_pic = NULL; + p_feed->i_items = 0; + p_feed->p_items = NULL; + + p_feed->psz_url = strdup( p_old_feed->psz_url ); + + /* Fetch the feed */ + msg_Dbg( p_filter, "opening %s RSS/Atom feed ...", p_feed->psz_url ); + + p_stream = stream_UrlNew( p_filter, p_feed->psz_url ); + if( !p_stream ) + { + msg_Err( p_filter, "Failed to open %s for reading", p_feed->psz_url ); + p_xml_reader = NULL; + goto error; + } + + p_xml_reader = xml_ReaderCreate( p_xml, p_stream ); + if( !p_xml_reader ) + { + msg_Err( p_filter, "Failed to open %s for parsing", p_feed->psz_url ); + goto error; + } + + /* Parse the feed */ + if( !ParseFeed( p_filter, p_xml_reader, p_feed ) ) + goto error; + + /* If we have a image: load it if requiere */ + if( b_images && p_feed->psz_image && !p_feed->p_pic ) + { + p_feed->p_pic = LoadImage( p_filter, p_feed->psz_image ); + } + + msg_Dbg( p_filter, "done with %s RSS/Atom feed", p_feed->psz_url ); + xml_ReaderDelete( p_xml, p_xml_reader ); + stream_Delete( p_stream ); + } + + xml_Delete( p_xml ); + return p_feeds; + +error: + FreeRSS( p_feeds, i_feed + 1 ); + if( p_xml_reader ) + xml_ReaderDelete( p_xml, p_xml_reader ); + if( p_stream ) + stream_Delete( p_stream ); + if( p_xml ) + xml_Delete( p_xml ); + + return NULL; +} + +/**************************************************************************** + * FreeRSS + ***************************************************************************/ +static void FreeRSS( rss_feed_t *p_feeds, int i_feeds ) +{ + for( int i_feed = 0; i_feed < i_feeds; i_feed++ ) { - p_feed = p_sys->p_feeds+i_feed; - for( i_item = 0; i_item < p_feed->i_items; i_item++ ) + rss_feed_t *p_feed = p_feeds+i_feed; + for( int i_item = 0; i_item < p_feed->i_items; i_item++ ) { - p_item = p_feed->p_items+i_item; + rss_item_t *p_item = p_feed->p_items+i_item; free( p_item->psz_title ); free( p_item->psz_link ); free( p_item->psz_description ); @@ -656,7 +1003,39 @@ static void FreeRSS( filter_t *p_filter) free( p_feed->psz_title); free( p_feed->psz_link ); free( p_feed->psz_description ); + free( p_feed->psz_image ); + if( p_feed->p_pic != NULL ) + picture_Release( p_feed->p_pic ); + free( p_feed->psz_url ); } - free( p_sys->p_feeds ); - p_sys->i_feeds = 0; + free( p_feeds ); +} + +static void Fetch( void *p_data ) +{ + filter_t *p_filter = p_data; + filter_sys_t *p_sys = p_filter->p_sys; + + msg_Dbg( p_filter, "Updating the rss feeds" ); + rss_feed_t *p_feeds = FetchRSS( p_filter ); + if( !p_feeds ) + { + msg_Err( p_filter, "Unable to fetch the feeds" ); + return; + } + + rss_feed_t *p_old_feeds = p_sys->p_feeds; + + vlc_mutex_lock( &p_sys->lock ); + /* Update the feeds */ + p_sys->p_feeds = p_feeds; + p_sys->b_fetched = true; + /* Set all current info to the original values */ + p_sys->i_cur_feed = 0; + p_sys->i_cur_item = p_sys->i_title == scroll_title ? -1 : 0; + p_sys->i_cur_char = 0; + vlc_mutex_unlock( &p_sys->lock ); + + if( p_old_feeds ) + FreeRSS( p_old_feeds, p_sys->i_feeds ); }