* 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 <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_vout.h>
#include "vlc_filter.h"
#include "vlc_block.h"
#include "vlc_block.h"
#include "vlc_stream.h"
#include "vlc_xml.h"
-#include "charset.h"
+#include <vlc_charset.h>
#include "vlc_image.h"
+#include <time.h>
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
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 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"),
int i_ttl;
time_t t_last_update;
- vlc_bool_t b_images;
+ bool b_images;
+ int i_title;
int i_cur_feed;
int i_cur_item;
int i_cur_char;
};
-#define MSG_TEXT N_("RSS/Atom feed URLs")
-#define MSG_LONGTEXT N_("RSS/Atom feed '|' (pipe) seperated URLs")
-#define SPEED_TEXT N_("RSS/Atom feed speed")
-#define SPEED_LONGTEXT N_("RSS/Atom feed speed (bigger is slower)")
-#define LENGTH_TEXT N_("RSS/Atom feed max number of chars displayed")
-#define LENGTH_LONGTEXT N_("RSS/Atom 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 IMAGE_TEXT N_("Display feed images if available")
-#define IMAGE_LONGTEXT N_("Display feed images if available")
-
-#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) seperated 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_capability( "sub filter", 1 );
set_shortname( "RSS / Atom" );
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 );
+ add_string( CFG_PREFIX "urls", "rss", NULL, MSG_TEXT, MSG_LONGTEXT, 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 );
+ 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, 0 );
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 );
+ 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, 0 );
- add_integer( "rss-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE );
+ add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, 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 );
- add_bool( "rss-images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, VLC_FALSE );
-
- set_description( _("RSS and Atom feed display") );
+ 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", 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, 0 );
+
+ 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
*****************************************************************************/
/* 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 );
- p_sys->psz_urls = var_CreateGetString( p_filter, "rss-urls" );
+ config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
+ p_filter->p_cfg );
+
+ p_sys->psz_urls = var_CreateGetString( p_filter, CFG_PREFIX "urls" );
+ 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->b_images = var_CreateGetBool( p_filter, "rss-images" );
- p_sys->psz_marquee = (char *)malloc( p_sys->i_length );
+ p_sys->i_speed = var_CreateGetInteger( p_filter, CFG_PREFIX "speed" );
+ 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 + 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, "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" );
+ 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 == 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;
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 );
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-images" );
- 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");
+ var_Destroy( p_filter, CFG_PREFIX "urls" );
+ var_Destroy( p_filter, CFG_PREFIX "speed" );
+ var_Destroy( p_filter, CFG_PREFIX "length" );
+ var_Destroy( p_filter, CFG_PREFIX "ttl" );
+ var_Destroy( p_filter, CFG_PREFIX "images" );
+ var_Destroy( p_filter, CFG_PREFIX "x" );
+ var_Destroy( p_filter, CFG_PREFIX "y" );
+ var_Destroy( p_filter, CFG_PREFIX "position" );
+ var_Destroy( p_filter, CFG_PREFIX "color");
+ var_Destroy( p_filter, CFG_PREFIX "opacity");
+ var_Destroy( p_filter, CFG_PREFIX "size");
+ var_Destroy( p_filter, CFG_PREFIX "title" );
}
/****************************************************************************
{
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
- + ( 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_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 )
{
vlc_mutex_unlock( &p_sys->lock );
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" );
+ 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->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 );
be p_sys->i_length characters long. */
i_item = p_sys->i_cur_item;
i_feed = p_sys->i_cur_feed;
- p_feed = &p_sys->p_feeds[p_sys->i_cur_feed];
+ p_feed = &p_sys->p_feeds[i_feed];
- if( p_feed->p_pic )
+ 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
+ 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 )
{
}
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_x = p_sys->i_xoff;
+ p_spu->i_y = p_sys->i_yoff;
+
p_spu->i_height = 1;
p_spu->p_region->p_style = p_sys->p_style;
{
/* 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;
* functions
***************************************************************************/
+#undef LoadImage /* do not conflict with Win32 API */
+
/****************************************************************************
* download and resize image located at psz_url
***************************************************************************/
-picture_t *LoadImage( filter_t *p_filter, const char *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={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 );
- char *psz_local;
+ memset( &fmt_in, 0, sizeof(video_format_t) );
+ memset( &fmt_out, 0, sizeof(video_format_t) );
- psz_local = ToLocale( psz_url );
fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
- p_orig = image_ReadUrl( p_handler, psz_local, &fmt_in, &fmt_out );
- LocaleFree( psz_local );
+ p_orig = image_ReadUrl( p_handler, psz_url, &fmt_in, &fmt_out );
if( !p_orig )
{
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 );
* remove all ' ' '\t' '\n' '\r' characters from the begining and end of the
* string.
***************************************************************************/
-char *removeWhiteChars( char *psz_src )
+static char *removeWhiteChars( char *psz_src )
{
char *psz_src2 = strdup( psz_src );
char *psz_clean = strdup( psz_src2 );
}
/****************************************************************************
- * FetchRSS
+ * FetchRSS (or Atom) feeds
***************************************************************************/
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 );
p_feed->i_items = 0;
p_feed->p_items = NULL;
- msg_Dbg( p_filter, "Opening %s RSS feed ...", psz_feed );
+ msg_Dbg( p_filter, "opening %s RSS/Atom feed ...", psz_feed );
p_stream = stream_UrlNew( p_filter, psz_feed );
if( !p_stream )
}
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 )
{
return 1;
case XML_READER_STARTELEM:
- 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 )
{
return 1;
}
-# define RSS_DEBUG
# ifdef RSS_DEBUG
- msg_Dbg( p_filter, "element name : %s", psz_eltname );
+ msg_Dbg( p_filter, "element name: %s", psz_eltname );
# endif
- if( !strcmp( psz_eltname, "item" )
- || !strcmp( psz_eltname, "entry" ) )
+ 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;
= NULL;
p_feed->p_items[p_feed->i_items-1].psz_link = NULL;
}
- else if( !strcmp( psz_eltname, "image" ) )
+ else if( !strcmp( psz_eltname, "image" ) ) /* rss */
{
- b_is_image = VLC_TRUE;
+ b_is_image = true;
+ }
+ else if( !strcmp( psz_eltname, "link" ) ) /* atom */
+ {
+ 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" ) )
+ {
+ psz_rel = psz_value;
+ }
+ else if( !strcmp( psz_name, "href" ) )
+ {
+ psz_href = psz_value;
+ }
+ else
+ {
+ free( psz_value );
+ }
+ free( psz_name );
+ }
+ if( psz_rel && psz_href )
+ {
+ if( !strcmp( psz_rel, "alternate" )
+ && b_is_item == false
+ && b_is_image == false
+ && !p_feed->psz_link )
+ {
+ p_feed->psz_link = psz_href;
+ }
+ /* this isn't in the rfc but i found some ... */
+ else if( ( !strcmp( psz_rel, "logo" )
+ || !strcmp( psz_rel, "icon" ) )
+ && b_is_item == false
+ && b_is_image == false
+ && !p_feed->psz_image )
+ {
+ p_feed->psz_image = psz_href;
+ }
+ else
+ {
+ free( psz_href );
+ }
+ }
+ else
+ {
+ free( psz_href );
+ }
+ 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 )
{
# ifdef RSS_DEBUG
msg_Dbg( p_filter, "element end : %s", psz_eltname );
# endif
- if( !strcmp( psz_eltname, "item" )
- || !strcmp( psz_eltname, "entry" ) )
+ 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" ) )
+ else if( !strcmp( psz_eltname, "image" ) ) /* rss */
{
- b_is_image = VLC_FALSE;
+ b_is_image = false;
}
free( psz_eltname );
psz_eltname = NULL;
# 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;
- if( !strcmp( psz_eltname, "title" ) )
+ if( !strcmp( psz_eltname, "title" ) /* rss/atom */
+ && !p_item->psz_title )
{
p_item->psz_title = psz_eltvalue;
}
- else if( !strcmp( psz_eltname, "link" ) )
+ else if( !strcmp( psz_eltname, "link" ) /* rss */
+ && !p_item->psz_link )
{
p_item->psz_link = psz_eltvalue;
}
- else if( !strcmp( psz_eltname, "description" ) )
+ else if((!strcmp( psz_eltname, "description" ) /* rss */
+ || !strcmp( psz_eltname, "summary" ) ) /* atom */
+ && !p_item->psz_description )
{
p_item->psz_description = psz_eltvalue;
}
psz_eltvalue = NULL;
}
}
- else if( b_is_image == VLC_TRUE )
+ else if( b_is_image == true )
{
- if( !strcmp( psz_eltname, "url" ) )
+ if( !strcmp( psz_eltname, "url" ) /* rss */
+ && !p_feed->psz_image )
{
p_feed->psz_image = psz_eltvalue;
- if( p_sys->b_images == VLC_TRUE )
- p_feed->p_pic = LoadImage( p_filter,
- p_feed->psz_image );
}
else
{
}
else
{
- if( !strcmp( psz_eltname, "title" ) )
+ if( !strcmp( psz_eltname, "title" ) /* rss/atom */
+ && !p_feed->psz_title )
{
p_feed->psz_title = psz_eltvalue;
}
- else if( !strcmp( psz_eltname, "link" ) )
+ else if( !strcmp( psz_eltname, "link" ) /* rss */
+ && !p_feed->psz_link )
{
p_feed->psz_link = psz_eltvalue;
}
- else if( !strcmp( psz_eltname, "description" )
- || !strcmp( psz_eltname, "subtitle" ) )
+ else if((!strcmp( psz_eltname, "description" ) /* rss */
+ || !strcmp( psz_eltname, "subtitle" ) ) /* atom */
+ && !p_feed->psz_description )
{
p_feed->psz_description = psz_eltvalue;
}
+ else if( ( !strcmp( psz_eltname, "logo" ) /* atom */
+ || !strcmp( psz_eltname, "icon" ) ) /* atom */
+ && !p_feed->psz_image )
+ {
+ p_feed->psz_image = psz_eltvalue;
+ }
else
{
free( psz_eltvalue );
}
}
+ 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 );
+ }
+
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 );
+ msg_Dbg( p_filter, "done with %s RSS/Atom feed", psz_feed );
}
free( psz_buffer_2 );
if( p_xml ) xml_Delete( p_xml );
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;
projects / vlc / blobdiff