access: fix ACCESS_GET_META and STREAM_GET_META mismatches

include/vlc_access.h

@@ -52,7 +52,7 @@ enum access_query_e
     ACCESS_GET_SEEKPOINT,   /* arg1=unsigned * res=can fail */
 
     /* 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_SIGNAL,      /* arg1=double *pf_quality, arg2=double *pf_strength   res=can fail */

include/vlc_stream.h

@@ -87,7 +87,7 @@ enum stream_query_e
     STREAM_GET_TITLE_INFO, /**< arg1=input_title_t*** arg2=int* res=can fail */
     STREAM_GET_TITLE,       /**< 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_SIGNAL,      /**< arg1=double *pf_quality, arg2=double *pf_strength   res=can fail */
 

modules/access/vcdx/access.c

@@ -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" );
         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" );
         }
         else

modules/access/vdr.c

@@ -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] );
 
         case ACCESS_GET_META:
-            if( !p_sys->p_meta )
-                return VLC_EGENERIC;
             p_meta = va_arg( args, vlc_meta_t* );
             vlc_meta_Merge( p_meta, p_sys->p_meta );
             break;