1 files changed, 65 insertions, 2 deletions

diff --git a/src/include/extractor.h b/src/include/extractor.h
index 77f0e63..b4e6a40 100644
--- a/src/include/extractor.h
+++ b/src/include/extractor.h
@@ -102,7 +102,12 @@ enum EXTRACTOR_MetaFormat
      * 0-terminated string.  The specific encoding is unknown.
      * "data_len" is strlen(data)+1.
      */
-    EXTRACTOR_METAFORMAT_C_STRING = 3
+    EXTRACTOR_METAFORMAT_C_STRING = 3,
+
+    /**
+     * 0-terminated string.  Contains a valid XML (with header and all).
+     */
+    EXTRACTOR_METAFORMAT_XML = 4
   };
 
 
@@ -318,7 +323,65 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_GROUP = 179,
     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME = 180,
 
-    EXTRACTOR_METATYPE_LAST = 181
+    EXTRACTOR_METATYPE_DISC_COUNT = 181,
+
+    EXTRACTOR_METATYPE_CODEC = 182,
+    EXTRACTOR_METATYPE_VIDEO_CODEC = 183,
+    EXTRACTOR_METATYPE_AUDIO_CODEC = 184,
+    EXTRACTOR_METATYPE_SUBTITLE_CODEC = 185,
+
+    EXTRACTOR_METATYPE_CONTAINER_FORMAT = 186,
+
+    EXTRACTOR_METATYPE_BITRATE = 187,
+    EXTRACTOR_METATYPE_NOMINAL_BITRATE = 188,
+    EXTRACTOR_METATYPE_MINIMUM_BITRATE = 189,
+    EXTRACTOR_METATYPE_MAXIMUM_BITRATE = 190,
+
+    EXTRACTOR_METATYPE_SERIAL = 191,
+
+    EXTRACTOR_METATYPE_ENCODER = 192,
+    EXTRACTOR_METATYPE_ENCODER_VERSION = 193,
+
+    EXTRACTOR_METATYPE_TRACK_GAIN = 194,
+    EXTRACTOR_METATYPE_TRACK_PEAK = 195,
+    EXTRACTOR_METATYPE_ALBUM_GAIN = 196,
+    EXTRACTOR_METATYPE_ALBUM_PEAK = 197,
+    EXTRACTOR_METATYPE_REFERENCE_LEVEL = 198,
+
+    EXTRACTOR_METATYPE_LOCATION_NAME = 199,
+    EXTRACTOR_METATYPE_LOCATION_ELEVATION = 200,
+    EXTRACTOR_METATYPE_LOCATION_HORIZONTAL_ERROR = 201,
+    EXTRACTOR_METATYPE_LOCATION_MOVEMENT_SPEED = 202,
+    EXTRACTOR_METATYPE_LOCATION_MOVEMENT_DIRECTION = 203,
+    EXTRACTOR_METATYPE_LOCATION_CAPTURE_DIRECTION = 204,
+
+    EXTRACTOR_METATYPE_SHOW_EPISODE_NUMBER = 205,
+    EXTRACTOR_METATYPE_SHOW_SEASON_NUMBER = 206,
+
+    EXTRACTOR_METATYPE_GROUPING = 207,
+
+    EXTRACTOR_METATYPE_DEVICE_MANUFACTURER = 208,
+    EXTRACTOR_METATYPE_DEVICE_MODEL = 209,
+
+    EXTRACTOR_METATYPE_AUDIO_LANGUAGE = 210,
+    EXTRACTOR_METATYPE_CHANNELS = 211,
+    EXTRACTOR_METATYPE_SAMPLE_RATE = 212,
+    EXTRACTOR_METATYPE_AUDIO_DEPTH = 213,
+    EXTRACTOR_METATYPE_AUDIO_BITRATE = 214,
+    EXTRACTOR_METATYPE_MAXIMUM_AUDIO_BITRATE = 215,
+
+    EXTRACTOR_METATYPE_VIDEO_DIMENSIONS = 216,
+    EXTRACTOR_METATYPE_VIDEO_DEPTH = 217,
+    EXTRACTOR_METATYPE_FRAME_RATE = 218,
+    EXTRACTOR_METATYPE_PIXEL_ASPECT_RATIO = 219,
+    EXTRACTOR_METATYPE_VIDEO_BITRATE = 220,
+    EXTRACTOR_METATYPE_MAXIMUM_VIDEO_BITRATE = 221,
+
+    EXTRACTOR_METATYPE_SUBTITLE_LANGUAGE = 222,
+    EXTRACTOR_METATYPE_VIDEO_LANGUAGE = 223,
+
+    EXTRACTOR_METATYPE_TOC = 224,
+    EXTRACTOR_METATYPE_LAST = 225
   };