* Preamble
*****************************************************************************/
-#include <vlc/vlc.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_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 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"),
int i_ttl;
time_t t_last_update;
- vlc_bool_t b_images;
+ bool b_images;
int i_title;
int i_cur_feed;
#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") };
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-"
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 );
+ 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, 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 );
+ 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( 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 );
+ false );
change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
- add_integer( CFG_PREFIX "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( 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 );
+ 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( _("RSS and Atom feed display") );
+ set_description( N_("RSS and Atom feed display") );
add_shortcut( "rss" );
add_shortcut( "atom" );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"urls", "x", "y", "position", "color", "size", "speed", "length",
"ttl", "images", "title", NULL
};
/* 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,
p_sys->psz_marquee = (char *)malloc( p_sys->i_length + 1 );
if( p_sys->psz_marquee == NULL )
{
- msg_Err( p_filter, "out of memory" );
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->p_style = malloc( sizeof( text_style_t ));
if( p_sys->p_style == NULL )
{
- msg_Err( p_filter, "out of memory" );
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;
}
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 ) )
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;
}
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;
}
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;
}
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 );
}
}
- 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 );
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_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;
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 );
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 );
}
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 )
{
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;
}
else if( !strcmp( psz_eltname, "image" ) ) /* rss */
{
- b_is_image = VLC_TRUE;
+ b_is_image = true;
}
else if( !strcmp( psz_eltname, "link" ) ) /* atom */
{
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;
/* 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;
}
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 )
{
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;
# 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;
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 )
}
}
- 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 );
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