Skip to content

V
vlc-2-2
Commit 19243633 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Attach VLM inputs to LibVLC. Fixes #2639.

parent 9312c3dc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/input/vlm.c
View file @ 19243633
...@@ -531,7 +531,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) ...@@ -531,7 +531,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
if( asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name ) == -1 ) if( asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name ) == -1 )
psz_header = NULL; psz_header = NULL;
if( (p_input = input_CreateThreadExtended( p_vlm, p_media->vod.p_item, psz_header, NULL ) ) ) if( (p_input = input_CreateThreadExtended( p_vlm->p_libvlc, p_media->vod.p_item, psz_header, NULL ) ) )
{ {
while( !p_input->b_eof && !p_input->b_error ) while( !p_input->b_eof && !p_input->b_error )
msleep( 100000 ); msleep( 100000 );
...@@ -881,7 +881,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * ...@@ -881,7 +881,7 @@ 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 ) if( asprintf( &psz_log, _("Media: %s"), p_media->cfg.psz_name ) != -1 )
{ {
p_instance->p_input = input_CreateThreadExtended( p_vlm, p_instance->p_item, p_instance->p_input = input_CreateThreadExtended( p_vlm->p_libvlc, p_instance->p_item,
psz_log, p_instance->p_input_resource ); psz_log, p_instance->p_input_resource );
p_instance->p_input_resource = NULL; p_instance->p_input_resource = NULL;
......
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