X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvlm.c;h=8e8a5d2f607cf4314c7a429f472c781b6073bcdd;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=96197a1ca70f49f0018b01bfa72c11c6e68e94fc;hpb=3a4de92b572fe75b489b4e00661648fddbcebcad;p=vlc diff --git a/src/input/vlm.c b/src/input/vlm.c index 96197a1ca7..8e8a5d2f60 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -37,6 +37,7 @@ #include #include +#include #ifndef WIN32 # include /* gettimeofday() */ @@ -105,19 +106,10 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, } vlm_SendEventMediaInstanceState( p_vlm, p_media->cfg.id, p_media->cfg.psz_name, psz_instance_name, var_GetInteger( p_input, "state" ) ); - // 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 ); + vlc_mutex_lock( &p_vlm->lock_manage ); + p_vlm->input_state_changed = true; + vlc_cond_signal( &p_vlm->wait_manage ); + vlc_mutex_unlock( &p_vlm->lock_manage ); } return VLC_SUCCESS; } @@ -156,19 +148,21 @@ vlm_t *vlm_New ( vlc_object_t *p_this ) } vlc_mutex_init( &p_vlm->lock ); - vlc_cond_init_daytime( &p_vlm->wait ); + vlc_mutex_init( &p_vlm->lock_manage ); + vlc_cond_init_daytime( &p_vlm->wait_manage ); + p_vlm->input_state_changed = false; p_vlm->i_id = 1; TAB_INIT( p_vlm->i_media, p_vlm->media ); TAB_INIT( p_vlm->i_schedule, p_vlm->schedule ); - p_vlm->i_vod = 0; p_vlm->p_vod = NULL; var_Create( p_vlm, "intf-event", VLC_VAR_ADDRESS ); vlc_object_attach( p_vlm, p_this->p_libvlc ); if( vlc_clone( &p_vlm->thread, Manage, p_vlm, VLC_THREAD_PRIORITY_LOW ) ) { - vlc_cond_destroy( &p_vlm->wait ); + vlc_cond_destroy( &p_vlm->wait_manage ); vlc_mutex_destroy( &p_vlm->lock ); + vlc_mutex_destroy( &p_vlm->lock_manage ); vlc_object_release( p_vlm ); vlc_mutex_unlock( &vlm_mutex ); return NULL; @@ -220,23 +214,34 @@ void vlm_Delete( vlm_t *p_vlm ) *****************************************************************************/ static void vlm_Destructor( vlm_t *p_vlm ) { + vlc_mutex_lock( &p_vlm->lock ); vlm_ControlInternal( p_vlm, VLM_CLEAR_MEDIAS ); TAB_CLEAN( p_vlm->i_media, p_vlm->media ); vlm_ControlInternal( p_vlm, VLM_CLEAR_SCHEDULES ); TAB_CLEAN( p_vlm->schedule, p_vlm->schedule ); - - 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 ); + + if( p_vlm->p_vod ) + { + module_unneed( p_vlm->p_vod, p_vlm->p_vod->p_module ); + vlc_object_release( p_vlm->p_vod ); + } + + vlc_mutex_lock( &p_vlm->lock_manage ); + p_vlm->input_state_changed = true; + vlc_cond_signal( &p_vlm->wait_manage ); + vlc_mutex_unlock( &p_vlm->lock_manage ); + /*vlc_cancel( p_vlm->thread ); */ vlc_join( p_vlm->thread, NULL ); - vlc_cond_destroy( &p_vlm->wait ); + vlc_cond_destroy( &p_vlm->wait_manage ); vlc_mutex_destroy( &p_vlm->lock ); + vlc_mutex_destroy( &p_vlm->lock_manage ); } /***************************************************************************** @@ -379,14 +384,20 @@ static void* Manage( void* p_object ) { char **ppsz_scheduled_commands = NULL; int i_scheduled_commands = 0; + bool scheduled_command = false; - vlc_mutex_lock( &vlm->lock ); - if( i_nextschedule ) - vlc_cond_timedwait( &vlm->wait, &vlm->lock, i_nextschedule ); - else - vlc_cond_wait( &vlm->wait, &vlm->lock ); - + vlc_mutex_lock( &vlm->lock_manage ); + while( !vlm->input_state_changed && !scheduled_command ) + { + if( i_nextschedule ) + scheduled_command = vlc_cond_timedwait( &vlm->wait_manage, &vlm->lock_manage, i_nextschedule ) != 0; + else + vlc_cond_wait( &vlm->wait_manage, &vlm->lock_manage ); + } + vlm->input_state_changed = false; + vlc_mutex_unlock( &vlm->lock_manage ); /* destroy the inputs that wants to die, and launch the next input */ + vlc_mutex_lock( &vlm->lock ); for( i = 0; i < vlm->i_media; i++ ) { vlm_media_sys_t *p_media = vlm->media[i]; @@ -483,8 +494,8 @@ static void* Manage( void* p_object ) } i_lastcheck = i_time; - vlc_mutex_unlock( &vlm->lock ); + } vlc_restorecancel (canc); @@ -558,7 +569,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) { vlm_media_t *p_cfg = &p_media->cfg; /* Check if we need to create/delete a vod media */ - if( p_cfg->b_vod ) + if( p_cfg->b_vod && p_vlm->p_vod ) { if( !p_cfg->b_enabled && p_media->vod.p_media ) { @@ -650,6 +661,8 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) } } } + else if ( p_cfg->b_vod ) + msg_Err( p_vlm, "vod server is not loaded" ); else { /* TODO start media if needed */ @@ -691,7 +704,7 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id return VLC_EGENERIC; } /* Check if we need to load the VOD server */ - if( p_cfg->b_vod && !p_vlm->i_vod ) + if( p_cfg->b_vod && !p_vlm->p_vod ) { p_vlm->p_vod = vlc_custom_create( VLC_OBJECT(p_vlm), sizeof( vod_t ), VLC_OBJECT_GENERIC, "vod server" ); @@ -713,9 +726,6 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id if( !p_media ) return VLC_ENOMEM; - if( p_cfg->b_vod ) - p_vlm->i_vod++; - vlm_media_Copy( &p_media->cfg, p_cfg ); p_media->cfg.id = p_vlm->i_id++; /* FIXME do we do something here if enabled is true ? */ @@ -750,7 +760,6 @@ static int vlm_ControlMediaDel( vlm_t *p_vlm, int64_t id ) { p_media->cfg.b_enabled = false; vlm_OnMediaUpdate( p_vlm, p_media ); - p_vlm->i_vod--; } /* */ @@ -766,14 +775,6 @@ static int vlm_ControlMediaDel( vlm_t *p_vlm, int64_t id ) TAB_REMOVE( p_vlm->i_media, p_vlm->media, p_media ); free( p_media ); - /* Check if we need to unload the VOD server */ - if( p_vlm->p_vod && p_vlm->i_vod <= 0 ) - { - module_unneed( p_vlm->p_vod, p_vlm->p_vod->p_module ); - vlc_object_release( p_vlm->p_vod ); - p_vlm->p_vod = NULL; - } - return VLC_SUCCESS; } @@ -858,21 +859,19 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc input_thread_t *p_input = p_instance->p_input; if( p_input ) { - input_resource_t *p_resource; - input_Stop( p_input, true ); vlc_thread_join( p_input ); - p_resource = input_DetachResource( p_input ); - input_resource_Delete( p_resource ); - var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media ); vlc_object_release( p_input ); vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name ); } if( p_instance->p_input_resource ) - input_resource_Delete( p_instance->p_input_resource ); + { + input_resource_Terminate( p_instance->p_input_resource ); + input_resource_Release( p_instance->p_input_resource ); + } TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); vlc_gc_decref( p_instance->p_item ); @@ -945,11 +944,10 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * return VLC_SUCCESS; } + input_Stop( p_input, true ); vlc_thread_join( p_input ); - p_instance->p_input_resource = input_DetachResource( p_input ); - var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media ); vlc_object_release( p_input ); @@ -969,6 +967,8 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * vlc_object_t *p_parent = p_media->cfg.b_vod ? VLC_OBJECT(p_vlm->p_vod) : VLC_OBJECT(p_vlm->p_libvlc); + if( !p_instance->p_input_resource ) + p_instance->p_input_resource = input_resource_New( VLC_OBJECT( p_vlm ) ); p_instance->p_input = input_Create( p_parent, p_instance->p_item, psz_log, p_instance->p_input_resource ); if( p_instance->p_input ) @@ -981,7 +981,6 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * p_instance->p_input = NULL; } } - p_instance->p_input_resource = NULL; if( !p_instance->p_input ) {