/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
#include <vlc_vout.h>
set_callbacks( Create, Destroy );
add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
- add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
+ 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 );
/* default to 1000 ms per image, continuously cycle through them */
add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, VLC_TRUE );
add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE );
add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
- add_integer( CFG_PREFIX "position", 6, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+ add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
/* subpicture filter submodule */
set_capability( "sub filter", 0 );
set_callbacks( CreateFilter, DestroyFilter );
set_description( _("Logo sub filter") );
- add_shortcut( "logo" );
vlc_module_end();
static const char *ppsz_filter_options[] = {
return VLC_ENOMEM;
}
- p_vout->pf_init = Init;
- p_vout->pf_end = End;
- p_vout->pf_manage = NULL;
- p_vout->pf_render = Render;
- p_vout->pf_display = NULL;
- p_vout->pf_control = Control;
-
config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options,
p_vout->p_cfg );
if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
{
msg_Err( p_vout, "logo file not specified" );
- return 0;
+ return VLC_EGENERIC;
}
+ p_vout->pf_init = Init;
+ p_vout->pf_end = End;
+ p_vout->pf_manage = NULL;
+ p_vout->pf_render = Render;
+ p_vout->pf_display = NULL;
+ p_vout->pf_control = Control;
+
p_sys->pos = var_CreateGetIntegerCommand( p_vout, "logo-position" );
p_sys->posx = var_CreateGetIntegerCommand( p_vout, "logo-x" );
p_sys->posy = var_CreateGetIntegerCommand( p_vout, "logo-y" );
free( p_sys );
/* Delete the logo variables from INPUT */
- var_Destroy( p_filter->p_libvlc_global , "logo-file" );
- var_Destroy( p_filter->p_libvlc_global , "logo-x" );
- var_Destroy( p_filter->p_libvlc_global , "logo-y" );
- var_Destroy( p_filter->p_libvlc_global , "logo-delay" );
- var_Destroy( p_filter->p_libvlc_global , "logo-repeat" );
- var_Destroy( p_filter->p_libvlc_global , "logo-position" );
- var_Destroy( p_filter->p_libvlc_global , "logo-transparency" );
+ var_Destroy( p_filter->p_libvlc, "logo-file" );
+ var_Destroy( p_filter->p_libvlc, "logo-x" );
+ var_Destroy( p_filter->p_libvlc, "logo-y" );
+ var_Destroy( p_filter->p_libvlc, "logo-delay" );
+ var_Destroy( p_filter->p_libvlc, "logo-repeat" );
+ var_Destroy( p_filter->p_libvlc, "logo-position" );
+ var_Destroy( p_filter->p_libvlc, "logo-transparency" );
}
/*****************************************************************************
vlc_mutex_unlock( &p_logo_list->lock );
/* where to locate the logo: */
- if( p_sys->posx < 0 || p_sys->posy < 0 )
- { /* set to one of the 9 relative locations */
- p_region->i_align = p_sys->pos;
- p_spu->i_x = 0;
- p_spu->i_y = 0;
- p_spu->b_absolute = VLC_FALSE;
+ if( p_sys->pos < 0 )
+ { /* set to an absolute xy */
+ p_spu->p_region->i_align = OSD_ALIGN_RIGHT | OSD_ALIGN_TOP;
+ p_spu->b_absolute = VLC_TRUE;
}
else
- { /* set to an absolute xy, referenced to upper left corner */
- p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
- p_spu->i_x = p_sys->posx;
- p_spu->i_y = p_sys->posy;
- p_spu->b_absolute = VLC_TRUE;
+ { /* set to one of the 9 relative locations */
+ p_spu->p_region->i_align = p_sys->pos;
+ p_spu->b_absolute = VLC_FALSE;
}
+ p_spu->i_x = p_sys->posx;
+ p_spu->i_y = p_sys->posy;
+
p_spu->p_region = p_region;
p_spu->i_alpha = ( p_logo->i_alpha != -1 ?