FREENULL( p_logo->psz_file );
if( p_logo->p_pic )
{
- p_logo->p_pic->pf_release( p_logo->p_pic );
+ picture_Release( p_logo->p_pic );
p_logo->p_pic = NULL;
}
}
/* Allocate structure */
p_sys = p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
- }
p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
if( p_logo_list == NULL )
{
- msg_Err( p_vout, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
{
msg_Err( p_vout, "logo file not specified" );
+ free( p_logo_list->psz_filename );
+ free( p_sys );
return VLC_EGENERIC;
}
vout_sys_t *p_sys = p_vout->p_sys;
int i_index;
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
+ DEL_CALLBACKS( p_sys->p_vout, SendEvents );
+
/* Free the fake output buffers we allocated */
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
var_DelCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
var_DelCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
- DEL_CALLBACKS( p_sys->p_vout, SendEvents );
- vlc_object_detach( p_sys->p_vout );
- vout_Destroy( p_sys->p_vout );
+ vout_CloseAndRelease( p_sys->p_vout );
if( p_sys->p_blend->p_module )
module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_sys_t *p_sys = p_vout->p_sys;
- DEL_PARENT_CALLBACKS( SendEventsToChild );
FreeLogoList( p_sys->p_logo_list );
free( p_sys->p_logo_list );
/* This is a new frame. Get a structure from the video_output. */
while( !(p_outpic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 )) )
{
- if( p_vout->b_die || p_vout->b_error ) return;
+ if( !vlc_object_alive (p_vout) || p_vout->b_error ) return;
msleep( VOUT_OUTMEM_SLEEP );
}
/* 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;
- }
p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
if( p_logo_list == NULL )
{
- msg_Err( p_filter, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
p_pic = p_logo->p_pic;
/* Allocate the subpicture internal data. */
- p_spu = p_filter->pf_sub_buffer_new( p_filter );
+ p_spu = filter_NewSubpicture( p_filter );
if( !p_spu )
{
vlc_mutex_unlock( &p_logo_list->lock );