}
vlm_SendEventMediaInstanceState( p_vlm, p_media->cfg.id, p_media->cfg.psz_name, psz_instance_name, var_GetInteger( p_input, "state" ) );
- vlc_mutex_lock( &p_vlm->lock_manage );
- vlc_cond_signal( &p_vlm->wait_manage );
- vlc_mutex_unlock( &p_vlm->lock_manage );
+ // We have ourselves been triggering the stop event.
+ // No need to wake up our manage thread, because
+ // we'll join it just after the Stop().
+ vlc_mutex_lock( &p_input->p->lock_control );
+ bool abort = p_input->p->b_abort;
+ vlc_mutex_unlock( &p_input->p->lock_control );
+
+ if (abort)
+ return VLC_SUCCESS;
+
+ vlc_mutex_lock( &p_vlm->lock );
+ vlc_cond_signal( &p_vlm->wait );
+ vlc_mutex_unlock( &p_vlm->lock );
}
return VLC_SUCCESS;
}
}
vlc_mutex_init( &p_vlm->lock );
- vlc_mutex_init( &p_vlm->lock_manage );
- vlc_cond_init_daytime( &p_vlm->wait_manage );
+ vlc_mutex_init( &p_vlm->lock );
+ vlc_cond_init_daytime( &p_vlm->wait );
p_vlm->i_id = 1;
TAB_INIT( p_vlm->i_media, p_vlm->media );
TAB_INIT( p_vlm->i_schedule, p_vlm->schedule );
if( vlc_clone( &p_vlm->thread, Manage, p_vlm, VLC_THREAD_PRIORITY_LOW ) )
{
- vlc_cond_destroy( &p_vlm->wait_manage );
- vlc_mutex_destroy( &p_vlm->lock_manage );
+ vlc_cond_destroy( &p_vlm->wait );
+ vlc_mutex_destroy( &p_vlm->lock );
vlc_mutex_destroy( &p_vlm->lock );
vlc_object_release( p_vlm );
vlc_mutex_unlock( &vlm_mutex );
vlm_ControlInternal( p_vlm, VLM_CLEAR_SCHEDULES );
TAB_CLEAN( p_vlm->schedule, p_vlm->schedule );
- vlc_mutex_lock( &p_vlm->lock_manage );
- vlc_cond_signal( &p_vlm->wait_manage );
- vlc_mutex_unlock( &p_vlm->lock_manage );
+ vlc_mutex_lock( &p_vlm->lock );
+ vlc_cond_signal( &p_vlm->wait );
+ vlc_mutex_unlock( &p_vlm->lock );
libvlc_priv(p_vlm->p_libvlc)->p_vlm = NULL;
vlc_object_kill( p_vlm );
/*vlc_cancel( p_vlm->thread ); */
vlc_join( p_vlm->thread, NULL );
- vlc_cond_destroy( &p_vlm->wait_manage );
- vlc_mutex_destroy( &p_vlm->lock_manage );
+ vlc_cond_destroy( &p_vlm->wait );
+ vlc_mutex_destroy( &p_vlm->lock );
vlc_mutex_destroy( &p_vlm->lock );
}
char **ppsz_scheduled_commands = NULL;
int i_scheduled_commands = 0;
- vlc_mutex_lock( &vlm->lock_manage );
+ vlc_mutex_lock( &vlm->lock );
if( i_nextschedule )
- vlc_cond_timedwait( &vlm->wait_manage, &vlm->lock_manage, i_nextschedule );
+ vlc_cond_timedwait( &vlm->wait, &vlm->lock, i_nextschedule );
else
- vlc_cond_wait( &vlm->wait_manage, &vlm->lock_manage );
- vlc_mutex_unlock( &vlm->lock_manage );
-
- vlc_mutex_lock( &vlm->lock );
+ vlc_cond_wait( &vlm->wait, &vlm->lock );
/* destroy the inputs that wants to die, and launch the next input */
for( i = 0; i < vlm->i_media; i++ )
var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse );
vlc_sem_destroy( &sem_preparse );
- input_Stop( p_input, false );
+ input_Stop( p_input, true );
vlc_thread_join( p_input );
vlc_object_release( p_input );
}
return VLC_SUCCESS;
}
- input_Stop( p_input, !p_input->b_eof && !p_input->b_error );
+ input_Stop( p_input, true );
vlc_thread_join( p_input );
p_instance->p_input_resource = input_DetachResource( p_input );