control/media_descriptor.c: Implement more meta.

diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h
index 4334a2f43bc1108bce542809610df09547f0afa3..29a52230cef8e4e30289fccfd2d6300272ccc5db 100644 (file)
--- a/include/vlc/libvlc_structures.h
+++ b/include/vlc/libvlc_structures.h
@@ -83,7 +83,22 @@ typedef struct libvlc_tag_query_t libvlc_tag_query_t;
 
 typedef enum libvlc_meta_t {
     libvlc_meta_Title,
-    libvlc_meta_Artist
+    libvlc_meta_Artist,
+    libvlc_meta_Genre,
+    libvlc_meta_Copyright,
+    libvlc_meta_Album,
+    libvlc_meta_TrackNumber,
+    libvlc_meta_Description,
+    libvlc_meta_Rating,
+    libvlc_meta_Date,
+    libvlc_meta_Settings,
+    libvlc_meta_URL,
+    libvlc_meta_Language,
+    libvlc_meta_NowPlaying,
+    libvlc_meta_Publisher,
+    libvlc_meta_EncodedBy,
+    libvlc_meta_ArtworkURL,
+    libvlc_meta_TrackID
 } libvlc_meta_t;
 
 /**@} */

diff --git a/src/control/media_descriptor.c b/src/control/media_descriptor.c
index 271052ca88bd4d056a9a8e8e4aceeb9b82ec0b9f..7d2d68e08cb24ea5cb04d2056e2d292c5c7fed0a 100644 (file)
--- a/src/control/media_descriptor.c
+++ b/src/control/media_descriptor.c
@@ -165,8 +165,23 @@ libvlc_media_descriptor_get_mrl( libvlc_media_descriptor_t * p_md,
  **************************************************************************/
 static const int meta_conversion[] =
 {
-    [libvlc_meta_Title]  = 0, /* Offset in the vlc_meta_t structure */
-    [libvlc_meta_Artist] = 1
+    [libvlc_meta_Title]        = 0, /* Offset in the vlc_meta_t structure */
+    [libvlc_meta_Artist]       = 1,
+    [libvlc_meta_Genre]        = 2,
+    [libvlc_meta_Copyright]    = 3,
+    [libvlc_meta_Album]        = 4,
+    [libvlc_meta_TrackNumber]  = 5,
+    [libvlc_meta_Description]  = 6,
+    [libvlc_meta_Rating]       = 7,
+    [libvlc_meta_Date]         = 8,
+    [libvlc_meta_Settings]     = 9,
+    [libvlc_meta_URL]          = 10,
+    [libvlc_meta_Language]     = 11,
+    [libvlc_meta_NowPlaying]   = 12,
+    [libvlc_meta_Publisher]    = 13,
+    [libvlc_meta_EncodedBy]    = 14,
+    [libvlc_meta_ArtworkURL]   = 15,
+    [libvlc_meta_TrackID]      = 16
 };
 
 char * libvlc_media_descriptor_get_meta( libvlc_media_descriptor_t *p_md,