1 files changed, 9 insertions, 6 deletions

diff --git a/src/include/extractor.h b/src/include/extractor.h
index 9c4ae60..ffebd5c 100644
--- a/src/include/extractor.h
+++ b/src/include/extractor.h
@@ -280,8 +280,8 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_PRODUCT_VERSION = 148,
     EXTRACTOR_METATYPE_CONTRIBUTOR_NAME = 149,
     EXTRACTOR_METATYPE_MOVIE_DIRECTOR = 150,
-    EXTRACTOR_METATYPE_TV_NETWORK_NAME = 151,
-    EXTRACTOR_METATYPE_TV_SHOW_NAME = 152,
+    EXTRACTOR_METATYPE_NETWORK_NAME = 151,
+    EXTRACTOR_METATYPE_SHOW_NAME = 152,
     EXTRACTOR_METATYPE_CHAPTER_NAME = 153,
     EXTRACTOR_METATYPE_SONG_COUNT = 154,
     EXTRACTOR_METATYPE_STARTING_SONG = 155,
@@ -295,13 +295,17 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_ORIGINAL_ARTIST = 163,
     EXTRACTOR_METATYPE_ORIGINAL_WRITER = 164,
     EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR = 165,
-    EXTRACTOR_METATYPE_LYRICS = 166,
-    EXTRACTOR_METATYPE_POPULARITY_METER = 167,
+    EXTRACTOR_METATYPE_ORIGINAL_PERFORMER = 166,
+    EXTRACTOR_METATYPE_LYRICS = 167,
+    EXTRACTOR_METATYPE_POPULARITY_METER = 168,
+    EXTRACTOR_METATYPE_LICENSEE = 169,
+    EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST = 170,
+    EXTRACTOR_METATYPE_MOOD = 171, 
+    EXTRACTOR_METATYPE_SUBTITLE = 172, 
 
     /* fixme: used up to here! */
 
     EXTRACTOR_METATYPE_MUSIC_CD_IDENTIFIER = 117,
-    EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST = 123,
 
     
     EXTRACTOR_METATYPE_SCALE = 108,
@@ -342,7 +346,6 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_FULL_NAME = 113,
     EXTRACTOR_METATYPE_LINK = 116,
     EXTRACTOR_METATYPE_TIME = 122,
-    EXTRACTOR_METATYPE_MOOD = 124, 
     EXTRACTOR_METATYPE_TELEVISION_SYSTEM = 126,
     EXTRACTOR_METATYPE_HARDWARE_DEPENDENCY = 129,
     EXTRACTOR_METATYPE_RIPPER = 130,