if( p_vout->p_module == NULL )
{
msg_Err( p_vout, "no suitable vout module" );
- // FIXME it's ugly but that's exactly the function that need to be called.
- EndThread( p_vout );
- vlc_object_detach( p_vout );
+ vlc_object_set_destructor( p_vout, vout_Destructor );
vlc_object_release( p_vout );
return NULL;
}
VLC_THREAD_PRIORITY_OUTPUT, true ) )
{
module_unneed( p_vout, p_vout->p_module );
+ p_vout->p_module = NULL;
+ vlc_object_set_destructor( p_vout, vout_Destructor );
vlc_object_release( p_vout );
return NULL;
}
/* Make sure the vout was stopped first */
assert( !p_vout->p_module );
+ /* */
+ spu_Destroy( p_vout->p_spu );
+
/* Destroy the locks */
vlc_mutex_destroy( &p_vout->picture_lock );
vlc_mutex_destroy( &p_vout->change_lock );
/* Destroy subpicture unit */
spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
- spu_Destroy( p_vout->p_spu );
/* Destroy the video filters2 */
filter_chain_Delete( p_vout->p->p_vf2_chain );