# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
- }
p_vout->pf_init = Init;
p_vout->pf_end = End;
* sizeof(char *) );
if( !p_vout->p_sys->ppsz_vout_list )
{
- msg_Err( p_vout, "out of memory" );
+ free( psz_clonelist );
free( p_vout->p_sys );
return VLC_ENOMEM;
}
{
int i_index;
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
/* Free the fake output buffers we allocated */
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
}
+
+ RemoveAllVout( p_vout );
}
/*****************************************************************************
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- RemoveAllVout( p_vout );
-
- DEL_PARENT_CALLBACKS( SendEventsToChild );
-
free( p_vout->p_sys->pp_vout );
free( p_vout->p_sys );
}
vout_CreatePicture( p_vout->p_sys->pp_vout[ i_vout ], 0, 0, 0 )
) == NULL )
{
- if( p_vout->b_die || p_vout->b_error )
+ if( !vlc_object_alive (p_vout) || p_vout->b_error )
{
vout_DestroyPicture(
p_vout->p_sys->pp_vout[ i_vout ], p_outpic );
--p_vout->p_sys->i_clones;
DEL_CALLBACKS( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones],
SendEvents );
- vlc_object_detach( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
- vout_Destroy( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
+ vout_CloseAndRelease( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
}
}