X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvlm.c;h=facc49c001dc0bd751a379e73300b1f84faf5c3a;hb=e763137961d9b1096ba3121508b4526f32017a0f;hp=db53c3881c1cc913ad6a2260c34439e1245211c2;hpb=75348facc56350e53eb336252c496876a5d04c09;p=vlc diff --git a/src/input/vlm.c b/src/input/vlm.c index db53c3881c..facc49c001 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -42,17 +42,20 @@ # include /* gettimeofday() */ #endif -#ifdef HAVE_TIME_H -# include /* ctime() */ -# include /* ftime() */ +#ifdef UNDER_CE +#include /* gettimeofday() */ +#endif + +#include /* ctime() */ +#if defined (WIN32) && !defined (UNDER_CE) +#include /* ftime() */ #endif #include -#include "input_internal.h" #include #include "vlm_internal.h" +#include "vlm_event.h" #include -#include #include #include "../stream_output/stream_output.h" #include "../libvlc.h" @@ -62,31 +65,74 @@ *****************************************************************************/ static void vlm_Destructor( vlm_t *p_vlm ); -static void* Manage( vlc_object_t * ); +static void* Manage( void * ); static int vlm_MediaVodControl( void *, vod_media_t *, const char *, int, va_list ); +static int InputEventPreparse( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + vlc_sem_t *p_sem_preparse = p_data; + + if( newval.i_int == INPUT_EVENT_DEAD || + newval.i_int == INPUT_EVENT_ITEM_META ) + vlc_sem_post( p_sem_preparse ); + + return VLC_SUCCESS; +} + +static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) +{ + VLC_UNUSED(psz_cmd); + VLC_UNUSED(oldval); + input_thread_t *p_input = (input_thread_t *)p_this; + vlm_t *p_vlm = libvlc_priv( p_input->p_libvlc )->p_vlm; + assert( p_vlm ); + vlm_media_sys_t *p_media = p_data; + const char *psz_instance_name = NULL; + + if( newval.i_int == INPUT_EVENT_STATE ) + { + for( int i = 0; i < p_media->i_instance; i++ ) + { + if( p_media->instance[i]->p_input == p_input ) + { + psz_instance_name = p_media->instance[i]->psz_name; + break; + } + } + 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 ); + p_vlm->input_state_changed = true; + vlc_cond_signal( &p_vlm->wait_manage ); + vlc_mutex_unlock( &p_vlm->lock_manage ); + } + return VLC_SUCCESS; +} + +static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX; + +#undef vlm_New /***************************************************************************** * vlm_New: *****************************************************************************/ -vlm_t *__vlm_New ( vlc_object_t *p_this ) +vlm_t *vlm_New ( vlc_object_t *p_this ) { - vlc_value_t lockval; vlm_t *p_vlm = NULL, **pp_vlm = &(libvlc_priv (p_this->p_libvlc)->p_vlm); char *psz_vlmconf; static const char vlm_object_name[] = "vlm daemon"; /* Avoid multiple creation */ - if( var_Create( p_this->p_libvlc, "vlm_mutex", VLC_VAR_MUTEX ) || - var_Get( p_this->p_libvlc, "vlm_mutex", &lockval ) ) - return NULL; - - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_lock( &vlm_mutex ); p_vlm = *pp_vlm; if( p_vlm ) { /* VLM already exists */ - vlc_object_yield( p_vlm ); - vlc_mutex_unlock( lockval.p_address ); + vlc_object_hold( p_vlm ); + vlc_mutex_unlock( &vlm_mutex ); return p_vlm; } @@ -96,26 +142,33 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) vlm_object_name ); if( !p_vlm ) { - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); return NULL; } vlc_mutex_init( &p_vlm->lock ); + 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_thread_create( p_vlm, "vlm thread", - Manage, VLC_THREAD_PRIORITY_LOW, false ) ) + 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 ); + vlc_mutex_destroy( &p_vlm->lock_manage ); vlc_object_release( p_vlm ); + vlc_mutex_unlock( &vlm_mutex ); return NULL; } + *pp_vlm = p_vlm; /* for future reference */ + /* Load our configuration file */ psz_vlmconf = var_CreateGetString( p_vlm, "vlm-conf" ); if( psz_vlmconf && *psz_vlmconf ) @@ -137,8 +190,7 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) free( psz_vlmconf ); vlc_object_set_destructor( p_vlm, (vlc_destructor_t)vlm_Destructor ); - *pp_vlm = p_vlm; /* for future reference */ - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); return p_vlm; } @@ -148,15 +200,12 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) *****************************************************************************/ void vlm_Delete( vlm_t *p_vlm ) { - vlc_value_t lockval; - /* vlm_Delete() is serialized against itself, and against vlm_New(). * This way, vlm_Destructor () (called from vlc_objet_release() above) * is serialized against setting libvlc_priv->p_vlm from vlm_New(). */ - var_Get( p_vlm->p_libvlc, "vlm_mutex", &lockval ); - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_lock( &vlm_mutex ); vlc_object_release( p_vlm ); - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); } /***************************************************************************** @@ -164,15 +213,35 @@ void vlm_Delete( vlm_t *p_vlm ) *****************************************************************************/ static void vlm_Destructor( vlm_t *p_vlm ) { - libvlc_priv (p_vlm->p_libvlc)->p_vlm = NULL; - + 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_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_detach( p_vlm->p_vod ); + 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_manage ); vlc_mutex_destroy( &p_vlm->lock ); + vlc_mutex_destroy( &p_vlm->lock_manage ); } /***************************************************************************** @@ -193,7 +262,7 @@ int vlm_ExecuteCommand( vlm_t *p_vlm, const char *psz_command, int64_t vlm_Date(void) { -#ifdef WIN32 +#if defined (WIN32) && !defined (UNDER_CE) struct timeb tm; ftime( &tm ); return ((int64_t)tm.time) * 1000000 + ((int64_t)tm.millitm) * 1000; @@ -300,23 +369,35 @@ static int vlm_MediaVodControl( void *p_private, vod_media_t *p_vod_media, /***************************************************************************** * Manage: *****************************************************************************/ -static void* Manage( vlc_object_t* p_object ) +static void* Manage( void* p_object ) { vlm_t *vlm = (vlm_t*)p_object; int i, j; mtime_t i_lastcheck; mtime_t i_time; + mtime_t i_nextschedule = 0; + int canc = vlc_savecancel (); i_lastcheck = vlm_Date(); while( !vlm->b_die ) { char **ppsz_scheduled_commands = NULL; int i_scheduled_commands = 0; + bool scheduled_command = false; - vlc_mutex_lock( &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]; @@ -351,6 +432,7 @@ static void* Manage( vlc_object_t* p_object ) /* scheduling */ i_time = vlm_Date(); + i_nextschedule = 0; for( i = 0; i < vlm->i_schedule; i++ ) { @@ -378,17 +460,25 @@ static void* Manage( vlc_object_t* p_object ) vlm->schedule[i]->i_period; } - if( i_real_date <= i_time && i_real_date > i_lastcheck ) + if( i_real_date <= i_time ) { - for( j = 0; j < vlm->schedule[i]->i_command; j++ ) + if( i_real_date > i_lastcheck ) { - TAB_APPEND( i_scheduled_commands, - ppsz_scheduled_commands, - strdup(vlm->schedule[i]->command[j] ) ); + for( j = 0; j < vlm->schedule[i]->i_command; j++ ) + { + TAB_APPEND( i_scheduled_commands, + ppsz_scheduled_commands, + strdup(vlm->schedule[i]->command[j] ) ); + } } } + else + { + i_nextschedule = i_real_date; + } } } + while( i_scheduled_commands ) { vlm_message_t *message = NULL; @@ -404,12 +494,11 @@ static void* Manage( vlc_object_t* p_object ) } i_lastcheck = i_time; - vlc_mutex_unlock( &vlm->lock ); - msleep( 100000 ); } + vlc_restorecancel (canc); return NULL; } @@ -480,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 ) { @@ -510,24 +599,36 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) if( psz_output && asprintf( &psz_dup, "sout=%s", psz_output ) != -1 ) { - input_item_AddOption( p_media->vod.p_item, psz_dup ); + input_item_AddOption( p_media->vod.p_item, psz_dup, VLC_INPUT_OPTION_TRUSTED ); free( psz_dup ); } free( psz_output ); for( i = 0; i < p_cfg->i_option; i++ ) input_item_AddOption( p_media->vod.p_item, - p_cfg->ppsz_option[i] ); + p_cfg->ppsz_option[i], VLC_INPUT_OPTION_TRUSTED ); if( asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name ) == -1 ) psz_header = NULL; - if( (p_input = input_CreateThreadExtended( p_vlm, p_media->vod.p_item, psz_header, NULL ) ) ) + p_input = input_Create( p_vlm->p_vod, p_media->vod.p_item, psz_header, NULL ); + if( p_input ) { - while( !p_input->b_eof && !p_input->b_error ) - msleep( 100000 ); + vlc_sem_t sem_preparse; + vlc_sem_init( &sem_preparse, 0 ); + var_AddCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse ); - input_StopThread( p_input ); + if( !input_Start( p_input ) ) + { + while( !p_input->b_dead && ( !p_cfg->vod.psz_mux || !input_item_IsPreparsed( p_media->vod.p_item ) ) ) + vlc_sem_wait( &sem_preparse ); + } + + var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse ); + vlc_sem_destroy( &sem_preparse ); + + input_Stop( p_input, true ); + vlc_thread_join( p_input ); vlc_object_release( p_input ); } free( psz_header ); @@ -536,17 +637,19 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) { input_item_t item; es_format_t es, *p_es = &es; - char fourcc[5]; + union { char text[5]; uint32_t value; } fourcc; - sprintf( fourcc, "%4.4s", p_cfg->vod.psz_mux ); - fourcc[0] = tolower(fourcc[0]); fourcc[1] = tolower(fourcc[1]); - fourcc[2] = tolower(fourcc[2]); fourcc[3] = tolower(fourcc[3]); + sprintf( fourcc.text, "%4.4s", p_cfg->vod.psz_mux ); + fourcc.text[0] = tolower(fourcc.text[0]); + fourcc.text[1] = tolower(fourcc.text[1]); + fourcc.text[2] = tolower(fourcc.text[2]); + fourcc.text[3] = tolower(fourcc.text[3]); /* XXX: Don't do it that way, but properly use a new input item ref. */ item = *p_media->vod.p_item; item.i_es = 1; item.es = &p_es; - es_format_Init( &es, VIDEO_ES, *((int *)fourcc) ); + es_format_Init( &es, VIDEO_ES, fourcc.value ); p_media->vod.p_media = p_vlm->p_vod->pf_media_new( p_vlm->p_vod, p_cfg->psz_name, &item ); @@ -558,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 */ @@ -565,6 +670,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) /* TODO add support of var vlm_media_broadcast/vlm_media_vod */ + vlm_SendEventMediaChanged( p_vlm, p_cfg->id, p_cfg->psz_name ); return VLC_SUCCESS; } static int vlm_ControlMediaChange( vlm_t *p_vlm, vlm_media_t *p_cfg ) @@ -598,18 +704,17 @@ 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" ); - vlc_object_attach( p_vlm->p_vod, p_vlm ); - p_vlm->p_vod->p_module = module_Need( p_vlm->p_vod, "vod server", 0, 0 ); + vlc_object_attach( p_vlm->p_vod, p_vlm->p_libvlc ); + p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", NULL, false ); if( !p_vlm->p_vod->p_module ) { msg_Err( p_vlm, "cannot find vod server" ); - vlc_object_detach( p_vlm->p_vod ); vlc_object_release( p_vlm->p_vod ); - p_vlm->p_vod = 0; + p_vlm->p_vod = NULL; return VLC_EGENERIC; } @@ -617,13 +722,9 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id p_vlm->p_vod->pf_media_control = vlm_MediaVodControl; } - p_media = malloc( sizeof( vlm_media_sys_t ) ); + p_media = calloc( 1, sizeof( vlm_media_sys_t ) ); if( !p_media ) return VLC_ENOMEM; - memset( p_media, 0, sizeof(vlm_media_sys_t) ); - - 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++; @@ -640,6 +741,8 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id if( p_id ) *p_id = p_media->cfg.id; + /* */ + vlm_SendEventMediaAdded( p_vlm, p_media->cfg.id, p_media->cfg.psz_name ); return vlm_OnMediaUpdate( p_vlm, p_media ); } @@ -657,25 +760,21 @@ 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--; } + /* */ + vlm_SendEventMediaRemoved( p_vlm, id, p_media->cfg.psz_name ); + vlm_media_Clean( &p_media->cfg ); vlc_gc_decref( p_media->vod.p_item ); - TAB_REMOVE( p_vlm->i_media, p_vlm->media, p_media ); + if( p_media->vod.p_media ) + p_vlm->p_vod->pf_media_del( p_vlm->p_vod, p_media->vod.p_media ); + 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_detach( p_vlm->p_vod ); - vlc_object_release( p_vlm->p_vod ); - p_vlm->p_vod = NULL; - } return VLC_SUCCESS; } @@ -738,12 +837,10 @@ static vlm_media_instance_sys_t *vlm_ControlMediaInstanceGetByName( vlm_media_sy } static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char *psz_name ) { - vlm_media_instance_sys_t *p_instance = malloc( sizeof(vlm_media_instance_sys_t) ); + vlm_media_instance_sys_t *p_instance = calloc( 1, sizeof(vlm_media_instance_sys_t) ); if( !p_instance ) return NULL; - memset( p_instance, 0, sizeof(vlm_media_instance_sys_t) ); - p_instance->psz_name = NULL; if( psz_name ) p_instance->psz_name = strdup( psz_name ); @@ -753,21 +850,32 @@ static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char p_instance->i_index = 0; p_instance->b_sout_keep = false; p_instance->p_input = NULL; - p_instance->p_sout = NULL; + p_instance->p_input_resource = NULL; return p_instance; } -static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance ) +static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instance_sys_t *p_instance, vlm_media_sys_t *p_media ) { - if( p_instance->p_input ) + input_thread_t *p_input = p_instance->p_input; + if( p_input ) { - input_StopThread( p_instance->p_input ); - p_instance->p_sout = input_DetachSout( p_instance->p_input ); - vlc_object_release( p_instance->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_sout ) - sout_DeleteInstance( p_instance->p_sout ); + if( p_instance->p_input_resource ) + input_resource_Delete( p_instance->p_input_resource ); + TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); vlc_gc_decref( p_instance->p_item ); free( p_instance->psz_name ); free( p_instance ); @@ -809,7 +917,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * (p_cfg->psz_output && psz_vod_output) ? ":" : psz_vod_output ? "#" : "", psz_vod_output ? psz_vod_output : "" ) != -1 ) { - input_item_AddOption( p_instance->p_item, psz_buffer ); + input_item_AddOption( p_instance->p_item, psz_buffer, VLC_INPUT_OPTION_TRUSTED ); free( psz_buffer ); } } @@ -821,30 +929,37 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * else if( !strcmp( p_cfg->ppsz_option[i], "nosout-keep" ) || !strcmp( p_cfg->ppsz_option[i], "no-sout-keep" ) ) p_instance->b_sout_keep = false; else - input_item_AddOption( p_instance->p_item, p_cfg->ppsz_option[i] ); + input_item_AddOption( p_instance->p_item, p_cfg->ppsz_option[i], VLC_INPUT_OPTION_TRUSTED ); } TAB_APPEND( p_media->i_instance, p_media->instance, p_instance ); } /* Stop old instance */ - if( p_instance->p_input ) + input_thread_t *p_input = p_instance->p_input; + if( p_input ) { if( p_instance->i_index == i_input_index && - !p_instance->p_input->b_eof && !p_instance->p_input->b_error ) + !p_input->b_eof && !p_input->b_error ) { - if( var_GetInteger( p_instance->p_input, "state" ) == PAUSE_S ) - var_SetInteger( p_instance->p_input, "state", PLAYING_S ); + if( var_GetInteger( p_input, "state" ) == PAUSE_S ) + var_SetInteger( p_input, "state", PLAYING_S ); return VLC_SUCCESS; } - input_StopThread( p_instance->p_input ); - p_instance->p_sout = input_DetachSout( 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 ); - p_instance->p_sout = NULL; - } + + 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 ); + + if( !p_instance->b_sout_keep ) + input_resource_TerminateSout( p_instance->p_input_resource ); + input_resource_TerminateVout( p_instance->p_input_resource ); + + vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name ); } /* Start new one */ @@ -853,11 +968,30 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * if( asprintf( &psz_log, _("Media: %s"), p_media->cfg.psz_name ) != -1 ) { - p_instance->p_input = input_CreateThreadExtended( p_vlm, p_instance->p_item, psz_log, p_instance->p_sout ); + vlc_object_t *p_parent = p_media->cfg.b_vod ? + VLC_OBJECT(p_vlm->p_vod) : + VLC_OBJECT(p_vlm->p_libvlc); + p_instance->p_input = input_Create( p_parent, p_instance->p_item, + psz_log, p_instance->p_input_resource ); + if( p_instance->p_input ) + { + var_AddCallback( p_instance->p_input, "intf-event", InputEvent, p_media ); + if( input_Start( p_instance->p_input ) != VLC_SUCCESS ) + { + var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media ); + vlc_object_release( p_instance->p_input ); + p_instance->p_input = NULL; + } + } + p_instance->p_input_resource = NULL; + if( !p_instance->p_input ) { - TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); - vlm_MediaInstanceDelete( p_instance ); + vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media ); + } + else + { + vlm_SendEventMediaInstanceStarted( p_vlm, id, p_media->cfg.psz_name ); } free( psz_log ); } @@ -877,9 +1011,7 @@ static int vlm_ControlMediaInstanceStop( vlm_t *p_vlm, int64_t id, const char *p if( !p_instance ) return VLC_EGENERIC; - TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); - - vlm_MediaInstanceDelete( p_instance ); + vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media ); return VLC_SUCCESS; } @@ -966,7 +1098,8 @@ static int vlm_ControlMediaInstanceGets( vlm_t *p_vlm, int64_t id, vlm_media_ins p_idsc->d_position = var_GetFloat( p_instance->p_input, "position" ); if( var_GetInteger( p_instance->p_input, "state" ) == PAUSE_S ) p_idsc->b_paused = true; - p_idsc->i_rate = var_GetInteger( p_instance->p_input, "rate" ); + p_idsc->i_rate = INPUT_RATE_DEFAULT + / var_GetFloat( p_instance->p_input, "rate" ); } TAB_APPEND( i_idsc, pp_idsc, p_idsc ); @@ -1145,3 +1278,4 @@ int vlm_Control( vlm_t *p_vlm, int i_query, ... ) return i_result; } +