stream: add STREAM_GET_META

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 0890c5464c9efc04782198295d711ccdc88321be..400a75f2abf77f2fdb0dea5466bfe00391e78e31 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -110,7 +110,7 @@ enum stream_query_e
 
     /* */
     STREAM_GET_TITLE_INFO = 0x102, /**< arg1=input_title_t*** arg2=int* res=can fail */
-    STREAM_RESERVED_FOR_GET_META_DO_NOT_USE,
+    STREAM_GET_META,        /**< arg1= vlc_meta_t **       res=can fail */
     STREAM_GET_CONTENT_TYPE,    /**< arg1= char **         res=can fail */
 
     STREAM_SET_PAUSE_STATE = 0x200, /**< arg1= bool        res=can fail */

diff --git a/src/input/stream.c b/src/input/stream.c
index f978fc697ad4ad71e6d1147da8ae122be9447de3..2f5022df4b657f37f2230309bcd65ef1879ede72 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -612,6 +612,8 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
 
         case STREAM_GET_TITLE_INFO:
             return access_vaControl( p_access, ACCESS_GET_TITLE_INFO, args );
+        case STREAM_GET_META:
+            return access_vaControl( p_access, ACCESS_GET_META, args );
         case STREAM_GET_CONTENT_TYPE:
             return access_vaControl( p_access, ACCESS_GET_CONTENT_TYPE, args );
 

diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c
index dfe045bdaa19f819bc6248c253ad7cfe5fe04847..12882f634ce585f51d76a8748ebc2a7e8c6103bf 100644 (file)
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -298,6 +298,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
 
         case STREAM_CONTROL_ACCESS:
         case STREAM_GET_TITLE_INFO:
+        case STREAM_GET_META:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_SET_PAUSE_STATE:
         case STREAM_SET_TITLE:

diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index 85f6e4b92fc743c69bf49a8ae8694788755074a0..fed59a716e0e4d55bcfe5f53e38301760a115f5c 100644 (file)
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -123,6 +123,7 @@ static int Control( stream_t *s, int i_query, va_list args )
             break;
 
         case STREAM_GET_TITLE_INFO:
+        case STREAM_GET_META:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_SET_TITLE:
         case STREAM_SET_SEEKPOINT: