# include "config.h"
#endif
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
-#include "vlc_filter.h"
-#include "vlc_block.h"
-#include "vlc_osd.h"
+#include <vlc_filter.h>
+#include <vlc_block.h>
+#include <vlc_osd.h>
-#include "vlc_block.h"
-#include "vlc_stream.h"
-#include "vlc_xml.h"
+#include <vlc_block.h>
+#include <vlc_stream.h>
+#include <vlc_xml.h>
#include <vlc_charset.h>
#include "vlc_image.h"
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"),
#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-"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-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, 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, false );
+ 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( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, 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,
- false );
+ 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( _("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
};
/* 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_sys->lock );
vlc_mutex_lock( &p_sys->lock );
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->psz_marquee[p_sys->i_length] = '\0';
- p_sys->p_style = malloc( sizeof( text_style_t ));
+ p_sys->p_style = text_style_New();
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;
}
- memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t ));
p_sys->i_xoff = var_CreateGetInteger( p_filter, CFG_PREFIX "x" );
p_sys->i_yoff = var_CreateGetInteger( p_filter, CFG_PREFIX "y" );
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 );
+ text_style_Delete( 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;
}
if( p_sys->i_feeds == 0 )
{
- free( p_sys->p_style );
+ text_style_Delete( 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;
}
{
if( p_sys->p_feeds[i_feed].i_items == 0 )
{
- free( p_sys->p_style );
+ text_style_Delete( 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;
}
vlc_mutex_lock( &p_sys->lock );
- free( p_sys->p_style );
+ text_style_Delete( p_sys->p_style );
free( p_sys->psz_marquee );
free( p_sys->psz_urls );
FreeRSS( p_filter );
}
}
- 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;
}
- fmt.i_chroma = VLC_FOURCC('T','E','X','T');
+ fmt.i_chroma = VLC_CODEC_TEXT;
- 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 );
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;
+ p_spu->p_region->p_style = text_style_Duplicate( p_sys->p_style );
if( p_feed->p_pic )
{
memset( &fmt_out, 0, sizeof(video_format_t) );
- fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
+ 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_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;
}
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');
+ fmt_out.i_chroma = VLC_CODEC_YUVA;
p_orig = image_ReadUrl( p_handler, psz_url, &fmt_in, &fmt_out );
if( !p_orig )
else if( p_sys->p_style->i_font_size > 0 )
{
- fmt_in.i_chroma = VLC_FOURCC('Y','U','V','A');
+ 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
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 );
case XML_READER_STARTELEM:
free( psz_eltname );
- psz_eltname = NULL;
psz_eltname = xml_ReaderName( p_xml_reader );
if( !psz_eltname )
{
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
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