[vlc-commits] stream: add STREAM_GET_META

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Apr 17 23:46:40 2013 +0300| [17d1f128e76b8ee320a77d2e3de505a60fd3d984] | committer: Rémi Denis-Courmont

stream: add STREAM_GET_META

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17d1f128e76b8ee320a77d2e3de505a60fd3d984
---

 include/vlc_stream.h      |    2 +-
 src/input/stream.c        |    2 ++
 src/input/stream_demux.c  |    1 +
 src/input/stream_memory.c |    1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 0890c54..400a75f 100644
--- 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 f978fc6..2f5022d 100644
--- 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 dfe045b..12882f6 100644
--- 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 85f6e4b..fed59a7 100644
--- 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: