Commit f788fa20 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

access: fix ACCESS_GET_META and STREAM_GET_META mismatches

parent f96d7832
...@@ -52,7 +52,7 @@ enum access_query_e ...@@ -52,7 +52,7 @@ enum access_query_e
ACCESS_GET_SEEKPOINT, /* arg1=unsigned * res=can fail */ ACCESS_GET_SEEKPOINT, /* arg1=unsigned * res=can fail */
/* Meta data */ /* Meta data */
ACCESS_GET_META, /* arg1= vlc_meta_t ** res=can fail */ ACCESS_GET_META, /* arg1= vlc_meta_t * res=can fail */
ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type res=can fail */ ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type res=can fail */
ACCESS_GET_SIGNAL, /* arg1=double *pf_quality, arg2=double *pf_strength res=can fail */ ACCESS_GET_SIGNAL, /* arg1=double *pf_quality, arg2=double *pf_strength res=can fail */
......
...@@ -87,7 +87,7 @@ enum stream_query_e ...@@ -87,7 +87,7 @@ enum stream_query_e
STREAM_GET_TITLE_INFO, /**< arg1=input_title_t*** arg2=int* res=can fail */ STREAM_GET_TITLE_INFO, /**< arg1=input_title_t*** arg2=int* res=can fail */
STREAM_GET_TITLE, /**< arg1=unsigned * res=can fail */ STREAM_GET_TITLE, /**< arg1=unsigned * res=can fail */
STREAM_GET_SEEKPOINT, /**< arg1=unsigned * res=can fail */ STREAM_GET_SEEKPOINT, /**< arg1=unsigned * res=can fail */
STREAM_GET_META, /**< arg1= vlc_meta_t ** res=can fail */ STREAM_GET_META, /**< arg1= vlc_meta_t * res=can fail */
STREAM_GET_CONTENT_TYPE, /**< arg1= char ** res=can fail */ STREAM_GET_CONTENT_TYPE, /**< arg1= char ** res=can fail */
STREAM_GET_SIGNAL, /**< arg1=double *pf_quality, arg2=double *pf_strength res=can fail */ STREAM_GET_SIGNAL, /**< arg1=double *pf_quality, arg2=double *pf_strength res=can fail */
......
...@@ -964,9 +964,9 @@ static int VCDControl( access_t *p_access, int i_query, va_list args ) ...@@ -964,9 +964,9 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
dbg_print( INPUT_DBG_EVENT, "get meta info" ); dbg_print( INPUT_DBG_EVENT, "get meta info" );
if( p_vcdplayer->p_meta ) if( p_vcdplayer->p_meta )
{ {
vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg(args,vlc_meta_t**); vlc_meta_t *p_meta = va_arg(args,vlc_meta_t *);
*pp_meta = vlc_meta_Duplicate( p_vcdplayer->p_meta ); vlc_meta_Merge( p_meta, p_vcdplayer->p_meta );
dbg_print( INPUT_DBG_META, "%s", "Meta copied" ); dbg_print( INPUT_DBG_META, "%s", "Meta copied" );
} }
else else
......
...@@ -324,8 +324,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) ...@@ -324,8 +324,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
return Seek( p_access, p_sys->offsets[i] ); return Seek( p_access, p_sys->offsets[i] );
case ACCESS_GET_META: case ACCESS_GET_META:
if( !p_sys->p_meta )
return VLC_EGENERIC;
p_meta = va_arg( args, vlc_meta_t* ); p_meta = va_arg( args, vlc_meta_t* );
vlc_meta_Merge( p_meta, p_sys->p_meta ); vlc_meta_Merge( p_meta, p_sys->p_meta );
break; break;
......
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