*
* Object lock is NOT held.
*/
-static void release_input_thread( libvlc_media_player_t *p_mi )
+static void release_input_thread( libvlc_media_player_t *p_mi, bool b_input_abort )
{
input_thread_t * p_input_thread;
input_event_changed, p_mi );
/* We owned this one */
- input_StopThread( p_input_thread );
+ input_StopThread( p_input_thread, b_input_abort );
vlc_thread_join( p_input_thread );
var_Destroy( p_input_thread, "drawable-hwnd" );
vlc_mutex_unlock( &p_mi->object_lock );
vlc_mutex_destroy( &p_mi->object_lock );
- release_input_thread( p_mi );
+ release_input_thread( p_mi, true );
libvlc_event_manager_release( p_mi->p_event_manager );
vlc_mutex_lock( &p_mi->object_lock );
- release_input_thread( p_mi );
+ /* FIXME I am not sure if it is a user request or on die(eof/error)
+ * request here */
+ release_input_thread( p_mi,
+ p_mi->p_input_thread &&
+ !p_mi->p_input_thread->b_eof &&
+ !p_mi->p_input_thread->b_error );
if( p_mi->p_md )
libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, p_e );
if( p_mi->b_own_its_input_thread )
{
vlc_mutex_lock( &p_mi->object_lock );
- release_input_thread( p_mi ); /* This will stop the input thread */
+ release_input_thread( p_mi, true ); /* This will stop the input thread */
vlc_mutex_unlock( &p_mi->object_lock );
}
else
if( !p_input_thread )
return;
- input_StopThread( p_input_thread );
+ input_StopThread( p_input_thread, true );
vlc_object_release( p_input_thread );
}
}