# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <vlc_filter.h>
add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false );
add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
false );
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
add_string( OSD_CFG "file", OSD_DEFAULT_CFG, NULL, OSD_FILE_TEXT,
OSD_FILE_LONGTEXT, false );
add_string( OSD_CFG "file-path", NULL, NULL, OSD_PATH_TEXT,
p_filter->p_sys = p_sys = (filter_sys_t *) malloc( sizeof(filter_sys_t) );
if( !p_filter->p_sys )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
memset( p_sys, 0, sizeof(filter_sys_t) );
/* Populating struct */
p_sys->p_menu->i_x = 0;
p_sys->p_menu->i_y = 0;
}
- else if( (p_sys->i_x >= 0) || (p_sys->i_y >= 0) )
+ else
{
p_sys->p_menu->i_x = p_sys->i_x;
p_sys->p_menu->i_y = p_sys->i_y;
}
- else if( (p_sys->p_menu->i_x < 0) ||
- (p_sys->p_menu->i_y < 0) )
- {
- p_sys->b_absolute = false;
- p_sys->p_menu->i_x = 0;
- p_sys->p_menu->i_y = 0;
- }
/* Set up p_filter */
p_sys->i_last_date = mdate();
error:
msg_Err( p_filter, "osdmenu filter discarded" );
- osd_MenuDelete( p_this, p_sys->p_menu );
- p_sys->p_menu = NULL;
+ free( p_sys->psz_path );
free( p_sys->psz_file );
free( p_sys );
return VLC_EGENERIC;
var_DelCallback( p_filter, OSD_CFG "update", OSDMenuCallback, p_sys );
var_DelCallback( p_filter, OSD_CFG "alpha", OSDMenuCallback, p_sys );
- var_DelCallback( p_sys->p_menu, "osd-menu-update",
- OSDMenuUpdateEvent, p_filter );
- var_DelCallback( p_sys->p_menu, "osd-menu-visible",
- OSDMenuVisibleEvent, p_filter );
+ if( p_sys )
+ {
+ var_DelCallback( p_sys->p_menu, "osd-menu-update",
+ OSDMenuUpdateEvent, p_filter );
+ var_DelCallback( p_sys->p_menu, "osd-menu-visible",
+ OSDMenuVisibleEvent, p_filter );
+ }
- if( p_sys->p_vout )
+ if( p_sys && p_sys->p_vout )
{
var_DelCallback( p_sys->p_vout, "mouse-x",
MouseEvent, p_sys );
var_Destroy( p_this, OSD_CFG "update" );
var_Destroy( p_this, OSD_CFG "alpha" );
- osd_MenuDelete( p_filter, p_sys->p_menu );
+ if( p_sys )
+ {
+ osd_MenuDelete( p_filter, p_sys->p_menu );
- free( p_sys->psz_file );
- free( p_sys );
+ free( p_sys->psz_path );
+ free( p_sys->psz_file );
+ free( p_sys );
+ }
}
/*****************************************************************************
return NULL; /* we are too early, so wait */
/* Allocate the subpicture internal data. */
- p_spu = p_filter->pf_sub_buffer_new( p_filter );
- if( !p_spu ) return NULL;
+ p_spu = filter_NewSubpicture( p_filter );
+ if( !p_spu )
+ return NULL;
p_spu->b_ephemer = true;
p_spu->b_fade = true;