Skip to content

V
vlc-2-2
Commit 41d8d0be authored by Sébastien Escudier's avatar Sébastien Escudier Committed by Rémi Denis-Courmont
Browse files
Options

vod preparsing : if muxer is specified, only wait for input_item_IsPreparsed 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent d2054d2c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/input/vlm.c
View file @ 41d8d0be
...@@ -75,7 +75,8 @@ static int InputEventPreparse( vlc_object_t *p_this, char const *psz_cmd, ...@@ -75,7 +75,8 @@ static int InputEventPreparse( vlc_object_t *p_this, char const *psz_cmd,
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
vlc_sem_t *p_sem_preparse = p_data; vlc_sem_t *p_sem_preparse = p_data;
if( newval.i_int == INPUT_EVENT_DEAD ) if( newval.i_int == INPUT_EVENT_DEAD ||
newval.i_int == INPUT_EVENT_ITEM_META )
vlc_sem_post( p_sem_preparse ); vlc_sem_post( p_sem_preparse );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -574,7 +575,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) ...@@ -574,7 +575,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
vlc_sem_init( &sem_preparse, 0 ); vlc_sem_init( &sem_preparse, 0 );
var_AddCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse ); var_AddCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse );
if( !p_input->b_dead ) while( !p_input->b_dead && ( !p_cfg->vod.psz_mux || !input_item_IsPreparsed( p_media->vod.p_item ) ) )
vlc_sem_wait( &sem_preparse ); vlc_sem_wait( &sem_preparse );
var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse ); var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment