/*****************************************************************************
* Prototypes
*****************************************************************************/
+
+/* input_CreateThread
+ * Release the returned input_thread_t using vlc_object_release() */
#define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b)
VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) );
+
#define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b)
VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) );
#define input_Read(a,b,c) __input_Read(VLC_OBJECT(a),b, c)
VLC_EXPORT( int, __input_Read, ( vlc_object_t *, input_item_t *, vlc_bool_t ) );
VLC_EXPORT( void, input_StopThread, ( input_thread_t * ) );
-VLC_EXPORT( void, input_DestroyThread, ( input_thread_t * ) );
enum input_query_e
{
if( p_sd->p_sys->pp_input[i] )
{
input_StopThread( p_sd->p_sys->pp_input[i] );
- input_DestroyThread( p_sd->p_sys->pp_input[i] );
+ vlc_object_release( p_sd->p_sys->pp_input[i] );
p_sd->p_sys->pp_input[i] = NULL;
}
}
|| p_sd->p_sys->pp_input[i]->b_error )
{
input_StopThread( p_sd->p_sys->pp_input[i] );
- input_DestroyThread( p_sd->p_sys->pp_input[i] );
+ vlc_object_release( p_sd->p_sys->pp_input[i] );
p_sd->p_sys->pp_input[i] = NULL;
REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i );
i--;
/* We owned this one */
input_StopThread( p_input_thread );
- input_DestroyThread( p_input_thread );
var_Destroy( p_input_thread, "drawable" );
}
- else
- vlc_object_release( p_input_thread );
+
+ vlc_object_release( p_input_thread );
p_mi->p_input_thread = NULL;
}
}
vlc_mutex_destroy( &p_mi->object_lock );
- input_DestroyThread( p_input_thread );
+ vlc_object_release( p_input_thread );
libvlc_media_descriptor_release( p_mi->p_md );
return p_input->p->p_sout;
}
-/**
- * Clean up a dead input thread
- * This function does not return until the thread is effectively cancelled.
- *
- * \param the input thread to kill
- */
-void input_DestroyThread( input_thread_t *p_input )
-{
- /* Join the thread */
- vlc_thread_join( p_input );
-
- /* */
- vlc_object_detach( p_input );
- vlc_object_release( p_input );
-}
-
/*****************************************************************************
* Run: main thread loop
* This is the "normal" thread that spawns the input processing chain,
msleep( 100000 );
input_StopThread( p_input );
- input_DestroyThread( p_input );
+ vlc_object_release( p_input );
}
free( psz_output );
free( psz_header );
{
input_StopThread( p_instance->p_input );
p_instance->p_sout = input_DetachSout( p_instance->p_input );
- input_DestroyThread( p_instance->p_input );
+ vlc_object_release( p_instance->p_input );
}
if( p_instance->p_sout )
sout_DeleteInstance( p_instance->p_sout );
input_StopThread( p_instance->p_input );
p_instance->p_sout = input_DetachSout( p_instance->p_input );
- input_DestroyThread( p_instance->p_input );
+ vlc_object_release( p_instance->p_input );
if( !p_instance->b_sout_keep && p_instance->p_sout )
{
sout_DeleteInstance( p_instance->p_sout );
input_DecoderDecode
input_DecoderDelete
input_DecoderNew
-input_DestroyThread
input_GetItem
input_ItemAddInfo
input_ItemAddOpt
p_playlist->p_input = NULL;
/* Release the playlist lock, because we may get stuck
- * in input_DestroyThread() for some time. */
+ * in vlc_object_release() for some time. */
PL_UNLOCK;
/* Destroy input */
- input_DestroyThread( p_input );
+ vlc_object_release( p_input );
PL_LOCK;
PL_UNLOCK;
/* Destroy input */
- input_DestroyThread( p_input );
+ vlc_object_release( p_input );
continue;
}
else if( p_playlist->p_input->b_die )