breaking build, porting plugins incomplete

10 files changed, 229 insertions, 651 deletions

diff --git a/README.debian b/README.debian
index e66daf8..ade7d37 100644
--- a/README.debian
+++ b/README.debian
@@ -20,6 +20,8 @@ libmpeg2-4-dev
 libqt4-dev
 librpm-dev
 libexiv2-dev # if you compile with --enable-exiv2
+libavformat-dev
+libswscale-dev
 
 For Subversion access and compilation:
 
diff --git a/TODO b/TODO
index 2b8761d..cc8c6eb 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,15 @@
 * ffmpeg needs make 3.81: add configure check for it
 
 Core:
-* error reporting facilities
-* add support for different character sets (to 'all' extractors)
+* check for symbolic links, do not load same plugin twice! 
+  (happens right now for installations with multiple
+   available thumbnailers)
+* support "hash" plugins as *optional* plugins
+  (need a way to indicate that they should not be used
+   "by default")
+* use "-" in config not to append plugin, but to remove one!
+* document
+* port test cases
 
 'Unclean' code:
 * ASF
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 9244d14..a790d4d 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -86,6 +86,9 @@ plugin_LTLIBRARIES = \
   libextractor_flv.la \
   libextractor_gif.la \
   libextractor_html.la \
+  libextractor_id3v2.la \
+  libextractor_id3v23.la \
+  libextractor_id3v24.la \
   libextractor_it.la \
   libextractor_jpeg.la \
   libextractor_man.la \
@@ -108,6 +111,8 @@ plugin_LTLIBRARIES = \
   libextractor_sid.la \
   libextractor_tar.la \
   $(thumbgtk) \
+  $(thumbqt) \
+  $(thumbffmpeg) \
   libextractor_tiff.la \
   libextractor_wav.la \
   libextractor_xm.la \
@@ -181,6 +186,27 @@ libextractor_html_la_LDFLAGS = \
 libextractor_html_la_LIBADD = \
   $(top_builddir)/src/common/libextractor_common.la
 
+libextractor_id3v2_la_SOURCES = \
+  id3v2_extractor.c 
+libextractor_id3v2_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_id3v2_la_LIBADD = \
+  $(top_builddir)/src/common/libextractor_common.la
+
+libextractor_id3v23_la_SOURCES = \
+  id3v23_extractor.c 
+libextractor_id3v23_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_id3v23_la_LIBADD = \
+  $(top_builddir)/src/common/libextractor_common.la
+
+libextractor_id3v24_la_SOURCES = \
+  id3v24_extractor.c 
+libextractor_id3v24_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_id3v24_la_LIBADD = \
+  $(top_builddir)/src/common/libextractor_common.la
+
 libextractor_it_la_SOURCES = \
   it_extractor.c 
 libextractor_it_la_LDFLAGS = \
@@ -318,6 +344,13 @@ libextractor_tar_la_SOURCES = \
 libextractor_tar_la_LDFLAGS = \
   $(PLUGINFLAGS)
 
+libextractor_thumbnailffmpeg_la_SOURCES = \
+  thumbnailffmpeg_extractor.c
+libextractor_thumbnailffmpeg_la_LIBADD = \
+  -lavformat -lavcodec -lswscale -lavutil -lz -lbz2
+libextractor_thumbnailffmpeg_la_LDFLAGS = \
+  $(PLUGINFLAGS) 
+
 libextractor_thumbnailgtk_la_CFLAGS = \
   $(GLIB_CFLAGS) $(GTK_CFLAGS)
 libextractor_thumbnailgtk_la_LIBADD = \
@@ -327,6 +360,15 @@ libextractor_thumbnailgtk_la_LDFLAGS = \
 libextractor_thumbnailgtk_la_SOURCES = \
   thumbnailgtk_extractor.c
 
+libextractor_thumbnailqt_la_SOURCES = \
+  thumbnailqt_extractor.cc
+libextractor_thumbnailqt_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_thumbnailqt_la_LIBADD = \
+  $(qtflags) $(svgflags) 
+libextractor_thumbnailqt_la_CPPFLAGS = \
+  $(QT_CFLAGS) $(QT_SVG_CFLAGS)
+
 libextractor_tiff_la_SOURCES = \
   tiff_extractor.c 
 libextractor_tiff_la_LDFLAGS = \
@@ -354,56 +396,6 @@ libextractor_zip_la_LDFLAGS = \
 EXTRA_DIST = template_extractor.c 
 
 
-
-# stuff below still needs to be ported to 0.6.x
-
-# SUBDIRS = . $(thumbffmpeg) hash
-
-
-OLD_LIBS = \
-  libextractor_id3v2.la \
-  libextractor_id3v24.la \
-  libextractor_id3v23.la \
-  $(extrampeg) \
-  $(thumbqt) 
-
-
-libextractor_id3v2_la_SOURCES = \
-  id3v2extractor.c 
-libextractor_id3v2_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_id3v2_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la
-
-libextractor_id3v23_la_SOURCES = \
-  id3v23extractor.c 
-libextractor_id3v23_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_id3v23_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la
-
-libextractor_id3v24_la_SOURCES = \
-  id3v24extractor.c 
-libextractor_id3v24_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_id3v24_la_LIBADD = \
-  $(top_builddir)/src/common/libextractor_common.la
-
-
-libextractor_thumbnailqt_la_SOURCES = \
-  thumbnailextractorqt.cc
-libextractor_thumbnailqt_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_thumbnailqt_la_LIBADD = \
-  $(qtflags) $(svgflags) \
-  $(top_builddir)/src/main/libextractor.la
-libextractor_thumbnailqt_la_CPPFLAGS = \
-  -I$(top_scrdir)/include \
-  $(QT_CFLAGS) $(QT_SVG_CFLAGS)
-
-
-# FIXME: is this still working ok? Doubtful!
-
 install-exec-hook:
         mkdir -p $(DESTDIR)$(plugindir) &> /dev/null || true
         rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT)
@@ -422,5 +414,3 @@ install-exec-hook:
                         fi \
                 fi \
         fi
-
-
diff --git a/src/plugins/id3v23extractor.c b/src/plugins/id3v23_extractor.c
index 7029e73..11b04d9 100644
--- a/src/plugins/id3v23extractor.c
+++ b/src/plugins/id3v23_extractor.c
@@ -51,60 +51,61 @@ addKeyword (EXTRACTOR_KeywordList * oldhead,
 typedef struct
 {
   const char *text;
-  EXTRACTOR_KeywordType type;
+  enum EXTRACTOR_MetaType type;
 } Matches;
 
 static Matches tmap[] = {
-  {"COMM", EXTRACTOR_COMMENT},
-  {"IPLS", EXTRACTOR_CONTRIBUTOR},
-  {"LINK", EXTRACTOR_LINK},
-  {"MCDI", EXTRACTOR_MUSIC_CD_IDENTIFIER},
-  {"PCNT", EXTRACTOR_PLAY_COUNTER},
-  {"POPM", EXTRACTOR_POPULARITY_METER},
-  {"TCOP", EXTRACTOR_COPYRIGHT},
-  {"TDAT", EXTRACTOR_DATE},
-  {"TCON", EXTRACTOR_CONTENT_TYPE},
-  {"TIT1", EXTRACTOR_GENRE},
-  {"TENC", EXTRACTOR_ENCODED_BY},
-  {"TEXT", EXTRACTOR_LYRICS},
-  {"TOLY", EXTRACTOR_CONTRIBUTOR},
-  {"TOPE", EXTRACTOR_CONTRIBUTOR},
-  {"TOWN", EXTRACTOR_OWNER},
-  {"TPE1", EXTRACTOR_ARTIST},
-  {"TPE2", EXTRACTOR_ARTIST},
-  {"TPE3", EXTRACTOR_CONDUCTOR},
-  {"TPE4", EXTRACTOR_INTERPRET},
-  {"TMED", EXTRACTOR_MEDIA_TYPE},
-  {"TCOM", EXTRACTOR_CREATOR},
-  {"TIME", EXTRACTOR_TIME},
-  {"TOFN", EXTRACTOR_FILENAME},
-  {"TOPE", EXTRACTOR_ARTIST},
-  {"TPUB", EXTRACTOR_PUBLISHER},
-  {"TRCK", EXTRACTOR_TRACK_NUMBER},
-  {"TRSC", EXTRACTOR_ISRC},
-  {"TRSN", EXTRACTOR_SOURCE},
-  {"TRSO", EXTRACTOR_CREATED_FOR},
-  {"TSRC", EXTRACTOR_RESOURCE_IDENTIFIER},
-  {"TOAL", EXTRACTOR_ALBUM},
-  {"TALB", EXTRACTOR_ALBUM},
-  {"TLAN", EXTRACTOR_LANGUAGE},
-  {"TYER", EXTRACTOR_YEAR},
-  {"TLEN", EXTRACTOR_DURATION},
-  {"TIT2", EXTRACTOR_TITLE},
-  {"TIT3", EXTRACTOR_DESCRIPTION},
-  {"WCOM", EXTRACTOR_RELEASE},
-  {"WCOP", EXTRACTOR_DISCLAIMER},
-  {"", EXTRACTOR_KEYWORDS},
-  {NULL, 0},
+  {"COMM", EXTRACTOR_METATYPE_COMMENT},
+  {"IPLS", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"LINK", EXTRACTOR_METATYPE_LINK},
+  {"MCDI", EXTRACTOR_METATYPE_MUSIC_CD_IDENTIFIER},
+  {"PCNT", EXTRACTOR_METATYPE_PLAY_COUNTER},
+  {"POPM", EXTRACTOR_METATYPE_POPULARITY_METER},
+  {"TCOP", EXTRACTOR_METATYPE_COPYRIGHT},
+  {"TDAT", EXTRACTOR_METATYPE_DATE},
+  {"TCON", EXTRACTOR_METATYPE_CONTENT_TYPE},
+  {"TIT1", EXTRACTOR_METATYPE_GENRE},
+  {"TENC", EXTRACTOR_METATYPE_ENCODED_BY},
+  {"TEXT", EXTRACTOR_METATYPE_LYRICS},
+  {"TOLY", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TOPE", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TOWN", EXTRACTOR_METATYPE_OWNER},
+  {"TPE1", EXTRACTOR_METATYPE_ARTIST},
+  {"TPE2", EXTRACTOR_METATYPE_ARTIST},
+  {"TPE3", EXTRACTOR_METATYPE_CONDUCTOR},
+  {"TPE4", EXTRACTOR_METATYPE_INTERPRET},
+  {"TMED", EXTRACTOR_METATYPE_MEDIA_TYPE},
+  {"TCOM", EXTRACTOR_METATYPE_CREATOR},
+  {"TIME", EXTRACTOR_METATYPE_TIME},
+  {"TOFN", EXTRACTOR_METATYPE_FILENAME},
+  {"TOPE", EXTRACTOR_METATYPE_ARTIST},
+  {"TPUB", EXTRACTOR_METATYPE_PUBLISHER},
+  {"TRCK", EXTRACTOR_METATYPE_TRACK_NUMBER},
+  {"TRSC", EXTRACTOR_METATYPE_ISRC},
+  {"TRSN", EXTRACTOR_METATYPE_SOURCE},
+  {"TRSO", EXTRACTOR_METATYPE_CREATED_FOR},
+  {"TSRC", EXTRACTOR_METATYPE_RESOURCE_IDENTIFIER},
+  {"TOAL", EXTRACTOR_METATYPE_ALBUM},
+  {"TALB", EXTRACTOR_METATYPE_ALBUM},
+  {"TLAN", EXTRACTOR_METATYPE_LANGUAGE},
+  {"TYER", EXTRACTOR_METATYPE_YEAR},
+  {"TLEN", EXTRACTOR_METATYPE_DURATION},
+  {"TIT2", EXTRACTOR_METATYPE_TITLE},
+  {"TIT3", EXTRACTOR_METATYPE_DESCRIPTION},
+  {"WCOM", EXTRACTOR_METATYPE_RELEASE},
+  {"WCOP", EXTRACTOR_METATYPE_DISCLAIMER},
+  {"", EXTRACTOR_METATYPE_KEYWORDS},
+  {NULL, 0}
 };
 
 
 /* mimetype = audio/mpeg */
-struct EXTRACTOR_Keywords *
-libextractor_id3v23_extract (const char *filename,
-                             const unsigned char *data,
-                             const size_t size,
-                             struct EXTRACTOR_Keywords *prev)
+int 
+EXTRACTOR_id3v23_extract (const unsigned char *data,
+                          size_t size,
+                          EXTRACTOR_MetaDataProcessor proc,
+                          void *proc_cls,
+                          const char *options)
 {
   int unsync;
   int extendedHdr;
@@ -215,4 +216,4 @@ libextractor_id3v23_extract (const char *filename,
   return prev;
 }
 
-/* end of id3v23extractor.c */
+/* end of id3v23_extractor.c */
diff --git a/src/plugins/id3v24extractor.c b/src/plugins/id3v24_extractor.c
index cb0231e..ec11e4a 100644
--- a/src/plugins/id3v24extractor.c
+++ b/src/plugins/id3v24_extractor.c
@@ -52,62 +52,63 @@ addKeyword (EXTRACTOR_KeywordList * oldhead,
 typedef struct
 {
   char *text;
-  EXTRACTOR_KeywordType type;
+  enum EXTRACTOR_MetaType type;
 } Matches;
 
 static Matches tmap[] = {
-  {"COMM", EXTRACTOR_COMMENT},
-  {"IPLS", EXTRACTOR_CONTRIBUTOR},
-  {"TIPL", EXTRACTOR_CONTRIBUTOR},
-  {"TMOO", EXTRACTOR_MOOD},
-  {"TMCL", EXTRACTOR_MUSICIAN_CREDITS_LIST},
-  {"LINK", EXTRACTOR_LINK},
-  {"MCDI", EXTRACTOR_MUSIC_CD_IDENTIFIER},
-  {"PCNT", EXTRACTOR_PLAY_COUNTER},
-  {"POPM", EXTRACTOR_POPULARITY_METER},
-  {"TCOP", EXTRACTOR_COPYRIGHT},
-  {"TDRC", EXTRACTOR_DATE},
-  {"TCON", EXTRACTOR_GENRE},
-  {"TIT1", EXTRACTOR_GENRE},
-  {"TENC", EXTRACTOR_ENCODED_BY},
-  {"TEXT", EXTRACTOR_LYRICS},
-  {"TOLY", EXTRACTOR_CONTRIBUTOR},
-  {"TOPE", EXTRACTOR_CONTRIBUTOR},
-  {"TOWN", EXTRACTOR_OWNER},
-  {"TPE1", EXTRACTOR_ARTIST},
-  {"TPE2", EXTRACTOR_ARTIST},
-  {"TPE3", EXTRACTOR_CONDUCTOR},
-  {"TPE4", EXTRACTOR_INTERPRET},
-  {"TIME", EXTRACTOR_TIME},
-  {"TMED", EXTRACTOR_MEDIA_TYPE},
-  {"TCOM", EXTRACTOR_CREATOR},
-  {"TOFN", EXTRACTOR_FILENAME},
-  {"TOPE", EXTRACTOR_ARTIST},
-  {"TPUB", EXTRACTOR_PUBLISHER},
-  {"TRCK", EXTRACTOR_TRACK_NUMBER},
-  {"TRSC", EXTRACTOR_ISRC},
-  {"TRSN", EXTRACTOR_SOURCE},
-  {"TRSO", EXTRACTOR_CREATED_FOR},
-  {"TSRC", EXTRACTOR_RESOURCE_IDENTIFIER},
-  {"TYER", EXTRACTOR_YEAR},
-  {"TOAL", EXTRACTOR_ALBUM},
-  {"TALB", EXTRACTOR_ALBUM},
-  {"TLAN", EXTRACTOR_LANGUAGE},
-  {"TIT2", EXTRACTOR_TITLE},
-  {"TIT3", EXTRACTOR_DESCRIPTION},
-  {"WCOM", EXTRACTOR_RELEASE},
-  {"WCOP", EXTRACTOR_DISCLAIMER},
-  {"", EXTRACTOR_KEYWORDS},
-  {NULL, 0},
+  {"COMM", EXTRACTOR_METATYPE_COMMENT},
+  {"IPLS", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TIPL", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TMOO", EXTRACTOR_METATYPE_MOOD},
+  {"TMCL", EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST},
+  {"LINK", EXTRACTOR_METATYPE_LINK},
+  {"MCDI", EXTRACTOR_METATYPE_MUSIC_CD_IDENTIFIER},
+  {"PCNT", EXTRACTOR_METATYPE_PLAY_COUNTER},
+  {"POPM", EXTRACTOR_METATYPE_POPULARITY_METER},
+  {"TCOP", EXTRACTOR_METATYPE_COPYRIGHT},
+  {"TDRC", EXTRACTOR_METATYPE_DATE},
+  {"TCON", EXTRACTOR_METATYPE_GENRE},
+  {"TIT1", EXTRACTOR_METATYPE_GENRE},
+  {"TENC", EXTRACTOR_METATYPE_ENCODED_BY},
+  {"TEXT", EXTRACTOR_METATYPE_LYRICS},
+  {"TOLY", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TOPE", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TOWN", EXTRACTOR_METATYPE_OWNER},
+  {"TPE1", EXTRACTOR_METATYPE_ARTIST},
+  {"TPE2", EXTRACTOR_METATYPE_ARTIST},
+  {"TPE3", EXTRACTOR_METATYPE_CONDUCTOR},
+  {"TPE4", EXTRACTOR_METATYPE_INTERPRET},
+  {"TIME", EXTRACTOR_METATYPE_TIME},
+  {"TMED", EXTRACTOR_METATYPE_MEDIA_TYPE},
+  {"TCOM", EXTRACTOR_METATYPE_CREATOR},
+  {"TOFN", EXTRACTOR_METATYPE_FILENAME},
+  {"TOPE", EXTRACTOR_METATYPE_ARTIST},
+  {"TPUB", EXTRACTOR_METATYPE_PUBLISHER},
+  {"TRCK", EXTRACTOR_METATYPE_TRACK_NUMBER},
+  {"TRSC", EXTRACTOR_METATYPE_ISRC},
+  {"TRSN", EXTRACTOR_METATYPE_SOURCE},
+  {"TRSO", EXTRACTOR_METATYPE_CREATED_FOR},
+  {"TSRC", EXTRACTOR_METATYPE_RESOURCE_IDENTIFIER},
+  {"TYER", EXTRACTOR_METATYPE_YEAR},
+  {"TOAL", EXTRACTOR_METATYPE_ALBUM},
+  {"TALB", EXTRACTOR_METATYPE_ALBUM},
+  {"TLAN", EXTRACTOR_METATYPE_LANGUAGE},
+  {"TIT2", EXTRACTOR_METATYPE_TITLE},
+  {"TIT3", EXTRACTOR_METATYPE_DESCRIPTION},
+  {"WCOM", EXTRACTOR_METATYPE_RELEASE},
+  {"WCOP", EXTRACTOR_METATYPE_DISCLAIMER},
+  {"", EXTRACTOR_METATYPE_KEYWORDS},
+  {NULL, 0}
 };
 
 
 /* mimetype = audio/mpeg */
-struct EXTRACTOR_Keywords *
-libextractor_id3v24_extract (const char *filename,
-                             const unsigned char *data,
-                             const size_t size,
-                             struct EXTRACTOR_Keywords *prev)
+int 
+EXTRACTOR_id3v24_extract (const unsigned char *data,
+                          size_t size,
+                          EXTRACTOR_MetaDataProcessor proc,
+                          void *proc_cls,
+                          const char *options)
 {
   int unsync;
   int extendedHdr;
@@ -226,4 +227,4 @@ libextractor_id3v24_extract (const char *filename,
   return prev;
 }
 
-/* end of id3v24extractor.c */
+/* end of id3v24_extractor.c */
diff --git a/src/plugins/id3v2extractor.c b/src/plugins/id3v2_extractor.c
index 00e353c..fa5fea6 100644
--- a/src/plugins/id3v2extractor.c
+++ b/src/plugins/id3v2_extractor.c
@@ -1,6 +1,6 @@
 /*
      This file is part of libextractor.
-     (C) 2002, 2003, 2004, 2006 Vidyut Samanta and Christian Grothoff
+     (C) 2002, 2003, 2004, 2006, 2009 Vidyut Samanta and Christian Grothoff
 
      libextractor is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -28,69 +28,57 @@
 
 #define DEBUG_EXTRACT_ID3v2 0
 
-
-static struct EXTRACTOR_Keywords *
-addKeyword (EXTRACTOR_KeywordList * oldhead,
-            char *phrase, EXTRACTOR_KeywordType type)
-{
-  EXTRACTOR_KeywordList *keyword;
-
-  keyword = (EXTRACTOR_KeywordList *) malloc (sizeof (EXTRACTOR_KeywordList));
-  keyword->next = oldhead;
-  keyword->keyword = phrase;
-  keyword->keywordType = type;
-  return keyword;
-}
-
 typedef struct
 {
-  char *text;
-  EXTRACTOR_KeywordType type;
+  const char *text;
+  enum EXTRACTOR_MetaType type;
 } Matches;
 
 static Matches tmap[] = {
-  {"TAL", EXTRACTOR_TITLE},
-  {"TT1", EXTRACTOR_GROUP},
-  {"TT2", EXTRACTOR_TITLE},
-  {"TT3", EXTRACTOR_TITLE},
-  {"TXT", EXTRACTOR_DESCRIPTION},
-  {"TPB", EXTRACTOR_PUBLISHER},
-  {"WAF", EXTRACTOR_LOCATION},
-  {"WAR", EXTRACTOR_LOCATION},
-  {"WAS", EXTRACTOR_LOCATION},
-  {"WCP", EXTRACTOR_COPYRIGHT},
-  {"WAF", EXTRACTOR_LOCATION},
-  {"WCM", EXTRACTOR_DISCLAIMER},
-  {"TSS", EXTRACTOR_FORMAT},
-  {"TYE", EXTRACTOR_DATE},
-  {"TLA", EXTRACTOR_LANGUAGE},
-  {"TP1", EXTRACTOR_ARTIST},
-  {"TP2", EXTRACTOR_ARTIST},
-  {"TP3", EXTRACTOR_CONDUCTOR},
-  {"TP4", EXTRACTOR_INTERPRET},
-  {"IPL", EXTRACTOR_CONTRIBUTOR},
-  {"TOF", EXTRACTOR_FILENAME},
-  {"TEN", EXTRACTOR_PRODUCER},
-  {"TCO", EXTRACTOR_SUBJECT},
-  {"TCR", EXTRACTOR_COPYRIGHT},
-  {"SLT", EXTRACTOR_LYRICS},
-  {"TOA", EXTRACTOR_ARTIST},
-  {"TRC", EXTRACTOR_ISRC},
-  {"TRK", EXTRACTOR_TRACK_NUMBER},
-  {"TCM", EXTRACTOR_CREATOR},
-  {"TOT", EXTRACTOR_ALBUM},
-  {"TOL", EXTRACTOR_AUTHOR},
-  {"COM", EXTRACTOR_COMMENT},
-  {"", EXTRACTOR_KEYWORDS},
+  {"TAL", EXTRACTOR_METATYPE_TITLE},
+  {"TT1", EXTRACTOR_METATYPE_GROUP},
+  {"TT2", EXTRACTOR_METATYPE_TITLE},
+  {"TT3", EXTRACTOR_METATYPE_TITLE},
+  {"TXT", EXTRACTOR_METATYPE_DESCRIPTION},
+  {"TPB", EXTRACTOR_METATYPE_PUBLISHER},
+  {"WAF", EXTRACTOR_METATYPE_LOCATION},
+  {"WAR", EXTRACTOR_METATYPE_LOCATION},
+  {"WAS", EXTRACTOR_METATYPE_LOCATION},
+  {"WCP", EXTRACTOR_METATYPE_COPYRIGHT},
+  {"WAF", EXTRACTOR_METATYPE_LOCATION},
+  {"WCM", EXTRACTOR_METATYPE_DISCLAIMER},
+  {"TSS", EXTRACTOR_METATYPE_FORMAT},
+  {"TYE", EXTRACTOR_METATYPE_DATE},
+  {"TLA", EXTRACTOR_METATYPE_LANGUAGE},
+  {"TP1", EXTRACTOR_METATYPE_ARTIST},
+  {"TP2", EXTRACTOR_METATYPE_ARTIST},
+  {"TP3", EXTRACTOR_METATYPE_CONDUCTOR},
+  {"TP4", EXTRACTOR_METATYPE_INTERPRET},
+  {"IPL", EXTRACTOR_METATYPE_CONTRIBUTOR},
+  {"TOF", EXTRACTOR_METATYPE_FILENAME},
+  {"TEN", EXTRACTOR_METATYPE_PRODUCER},
+  {"TCO", EXTRACTOR_METATYPE_SUBJECT},
+  {"TCR", EXTRACTOR_METATYPE_COPYRIGHT},
+  {"SLT", EXTRACTOR_METATYPE_LYRICS},
+  {"TOA", EXTRACTOR_METATYPE_ARTIST},
+  {"TRC", EXTRACTOR_METATYPE_ISRC},
+  {"TRK", EXTRACTOR_METATYPE_TRACK_NUMBER},
+  {"TCM", EXTRACTOR_METATYPE_CREATOR},
+  {"TOT", EXTRACTOR_METATYPE_ALBUM},
+  {"TOL", EXTRACTOR_METATYPE_AUTHOR},
+  {"COM", EXTRACTOR_METATYPE_COMMENT},
+  {"", EXTRACTOR_METATYPE_KEYWORDS},
   {NULL, 0},
 };
 
 
 /* mimetype = audio/mpeg */
-struct EXTRACTOR_Keywords *
-libextractor_id3v2_extract (const char *filename,
-                            const unsigned char *data,
-                            size_t size, struct EXTRACTOR_Keywords *prev)
+int 
+EXTRACTOR_id3v2_extract (const unsigned char *data,
+                         size_t size,
+                         EXTRACTOR_MetaDataProcessor proc,
+                         void *proc_cls,
+                         const char *options)
 {
   int unsync;
   unsigned int tsize;
@@ -100,14 +88,14 @@ libextractor_id3v2_extract (const char *filename,
       (data[0] != 0x49) ||
       (data[1] != 0x44) ||
       (data[2] != 0x33) || (data[3] != 0x02) || (data[4] != 0x00))
-    return prev;
+    return 0;
   unsync = (data[5] & 0x80) > 0;
   tsize = (((data[6] & 0x7F) << 21) |
            ((data[7] & 0x7F) << 14) |
            ((data[8] & 0x7F) << 07) | ((data[9] & 0x7F) << 00));
 
   if (tsize + 10 > size)
-    return prev;
+    return 0;
   pos = 10;
   while (pos < tsize)
     {
@@ -115,7 +103,7 @@ libextractor_id3v2_extract (const char *filename,
       int i;
 
       if (pos + 6 > tsize)
-        return prev;
+        return 0;
       csize = (data[pos + 3] << 16) + (data[pos + 4] << 8) + data[pos + 5];
       if ((pos + 6 + csize > tsize) || (csize > tsize) || (csize == 0))
         break;
@@ -161,7 +149,7 @@ libextractor_id3v2_extract (const char *filename,
         }
       pos += 6 + csize;
     }
-  return prev;
+  return 0;
 }
 
-/* end of id3v2extractor.c */
+/* end of id3v2_extractor.c */
diff --git a/src/plugins/thumbnailextractorqt.cc b/src/plugins/thumbnailextractorqt.cc
deleted file mode 100644
index 9ab3079..0000000
--- a/src/plugins/thumbnailextractorqt.cc
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-     This file is part of libextractor.
-     (C) 2006 Vidyut Samanta and Christian Grothoff
-
-     libextractor is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     libextractor is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with libextractor; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
- */
-
-/**
- * @file thumbnailextractorqt.cc
- * @author Nils Durner
- * @brief this extractor produces a binary (!) encoded
- * thumbnail of images (using Qt).
- */
-
-#include "platform.h"
-#include "extractor.h"
-#include <Qt/qpixmap.h>
-#include <Qt/qbytearray.h>
-#include <Qt/qbuffer.h>
-#include <Qt/qapplication.h>
-#include <pthread.h>
-
-#ifdef HAVE_QT_SVG
-  #include <Qt/qsvgrenderer.h>
-  #include <Qt/qpainter.h>
-#endif
-
-#define THUMBSIZE 128
-
-extern "C"
-{
-
-static EXTRACTOR_KeywordList * addKeyword(EXTRACTOR_KeywordType type,
-                                          char * keyword,
-                                          EXTRACTOR_KeywordList * next) {
-  EXTRACTOR_KeywordList * result;
-
-  if (keyword == NULL)
-    return next;
-  result = (EXTRACTOR_KeywordList *) malloc(sizeof(EXTRACTOR_KeywordList));
-  result->next = next;
-  result->keyword = keyword;
-  result->keywordType = type;
-  return result;
-}
-
-
-/* which mime-types maybe subjected to
-   the thumbnail extractor (ImageMagick
-   crashes and/or prints errors for bad
-   formats, so we need to be rather
-   conservative here) */
-static const char * whitelist[] = {
-  "image/x-bmp",
-  "image/gif",
-  "image/jpeg",
-  "image/png",
-  "image/x-png",
-  "image/x-portable-bitmap",
-  "image/x-portable-graymap",
-  "image/x-portable-pixmap",
-  "image/x-xbitmap",
-  "image/x-xpixmap"
-  "image/x-xpm",
-#ifdef HAVE_QT_SVG
-  "image/svg+xml",
-#endif
-  NULL
-};
-
-static struct EXTRACTOR_Keywords *
-extract(const unsigned char * data,
-        size_t size,
-        struct EXTRACTOR_Keywords * prev,
-        const char * options) {
-  QImage *img;
-  QByteArray bytes;
-  QBuffer buffer;
-  unsigned long width;
-  unsigned long height;
-  char * binary;
-  const char * mime;
-  int j;
-  char * format;
-  QImage::Format colors;
-
-  /* if the mime-type of the file is not whitelisted
-     do not run the thumbnail extactor! */
-  mime = EXTRACTOR_extractLast(EXTRACTOR_MIMETYPE,
-                               prev);
-  if (mime == NULL)
-    return prev;
-  j = 0;
-  while (whitelist[j] != NULL) {
-    if (0 == strcmp(whitelist[j], mime))
-      break;
-    j++;
-  }
-
-  if (whitelist[j] == NULL)
-    return prev;
-
-  /* Determine image format to use */
-  if (options == NULL)
-    colors = QImage::Format_Indexed8;
-  else
-    switch(atoi(options))
-    {
-      case 1:
-        colors = QImage::Format_Mono;
-        break;
-      case 8:
-        colors = QImage::Format_Indexed8;
-        break;
-      case 16:
-      case 24:
-        colors = QImage::Format_RGB32;
-        break;
-      default:
-        colors = QImage::Format_ARGB32;
-        break;
-    }
-
-#ifdef HAVE_QT_SVG
-  if (strcmp(mime, "image/svg+xml") == 0)
-  {
-    /* Render SVG image */
-    QSvgRenderer svg;
-    QSize size;
-
-    if (! svg.load(QByteArray((const char *) data)))
-      return prev;
-
-    size = svg.defaultSize();
-    img = new QImage(size, QImage::Format_ARGB32);
-
-    QPainter painter(img);
-    painter.setViewport(0, 0, size.width(), size.height());
-    painter.eraseRect(0, 0, size.width(), size.height());
-
-    svg.render(&painter);
-  }
-  else
-#endif
-  {
-    /* Load image */
-    img = new QImage();
-    img->loadFromData(data, size);
-  }
-
-  height = img->height();
-  width = img->width();
-  format = (char *) malloc(64);
-  snprintf(format,
-           64,
-           "%ux%u",
-           (unsigned int) width,
-           (unsigned int) height);
-  prev = addKeyword(EXTRACTOR_SIZE,
-                 format,
-                 prev);
-  if (height == 0)
-    height = 1;
-  if (width == 0)
-    width = 1;
-
-  /* Change color depth */
-  QImage thumb = img->convertToFormat(colors);
-  delete img;
-
-  /* Resize image
-   *
-   * Qt's scaled() produces poor quality if the image is resized to less than
-   * half the size. Therefore, we resize the image in multiple steps.
-   * http://lists.trolltech.com/qt-interest/2006-04/msg00376.html */
-  while(true)
-  {
-    width /= 2;
-    if (width < THUMBSIZE)
-      width = THUMBSIZE;
-
-    height /= 2;
-    if (height < THUMBSIZE)
-      height = THUMBSIZE;
-
-    thumb = thumb.scaled(width, height, Qt::KeepAspectRatio,
-      Qt::SmoothTransformation);
-
-    if (width == THUMBSIZE && height == THUMBSIZE)
-      break;
-  }
-
-  buffer.setBuffer(&bytes);
-  buffer.open(QIODevice::WriteOnly);
-  thumb.save(&buffer, "PNG");
-
-  binary
-    = EXTRACTOR_binaryEncode((const unsigned char*) bytes.data(),
-                             bytes.length());
-
-  if (binary == NULL)
-    return prev;
-
-  return addKeyword(EXTRACTOR_THUMBNAIL_DATA,
-                    binary,
-                    prev);
-}
-
-/* create new thread for C++ code (see Mantis #905) */
-
-struct X {
-  const unsigned char * data;
-  size_t size;
-  struct EXTRACTOR_Keywords * prev;
-  const char * options;
-};
-
-static void * run(void * arg) {
-  struct X * x = (struct X*) arg;
-  return extract(x->data, x->size, x->prev,
-                 x->options);
-}
-
-struct EXTRACTOR_Keywords *
-libextractor_thumbnailqt_extract(const char * filename,
-                                 const unsigned char * data,
-                                 size_t size,
-                                 struct EXTRACTOR_Keywords * prev,
-                                 const char * options) {
-  pthread_t pt;
-  struct X cls;
-
-  void * ret;
-  cls.data = data;
-  cls.size = size;
-  cls.prev = prev;
-  cls.options = options;
-  if (0 == pthread_create(&pt, NULL, &run, &cls))
-    if (0 == pthread_join(pt, &ret))
-      return (struct EXTRACTOR_Keywords*) ret;
-  return prev;
-}
-
-
-struct EXTRACTOR_Keywords *
-libextractor_thumbnail_extract(const char * filename,
-                               const unsigned char * data,
-                               size_t size,
-                               struct EXTRACTOR_Keywords * prev,
-                               const char * options) {
-  return libextractor_thumbnailqt_extract(filename,
-                                          data,
-                                          size,
-                                          prev,
-                                          options);
-}
-
-} // extern "C"
-
-/* end of thumbnailextractorqt.cc */
diff --git a/src/plugins/thumbnailffmpeg/Makefile.am b/src/plugins/thumbnailffmpeg/Makefile.am
deleted file mode 100644
index 8d1684e..0000000
--- a/src/plugins/thumbnailffmpeg/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-include ../Makefile-plugins.am
-
-plugin_LTLIBRARIES = \
- libextractor_thumbnailffmpeg.la
-
-libextractor_thumbnailffmpeg_la_SOURCES = \
-  thumbnailextractorffmpeg.c 
-libextractor_thumbnailffmpeg_la_LIBADD = \
-  $(top_builddir)/src/main/libextractor.la \
-  ../ffmpeg/libavformat/libavformat.a \
-  ../ffmpeg/libavcodec/libavcodec.a \
-  ../ffmpeg/libavutil/libavutil.a \
-  ../ffmpeg/libswscale/libswscale.a \
-  -lz -lbz2
-libextractor_thumbnailffmpeg_la_LDFLAGS = \
-  $(PLUGINFLAGS) $(retaincommand)
-libextractor_thumbnailffmpeg_la_CPPFLAGS = \
-  -I$(top_scrdir)/include \
-  -I../ffmpeg \
-  -I../ffmpeg/libavformat \
-  -I../ffmpeg/libavcodec \
-  -I../ffmpeg/libavutil \
-  -I../ffmpeg/libswscale
-
-../ffmpeg/libavformat/libavformat.a: Makefile
-        cd ../ffmpeg && $(MAKE) $(AM_MAKEFLAGS) all
-../ffmpeg/libavcodec/libavcodec.a: Makefile
-        cd ../ffmpeg && $(MAKE) $(AM_MAKEFLAGS) all
-../ffmpeg/libavutil/libavutil.a: Makefile
-        cd ../ffmpeg && $(MAKE) $(AM_MAKEFLAGS) all
-../ffmpeg/libswscale/libswscale.a: Makefile
-        cd ../ffmpeg && $(MAKE) $(AM_MAKEFLAGS) all
-
-clean-local:
-        cd ../ffmpeg && $(MAKE) $(AM_MAKEFLAGS) clean
-distclean-local:
-        cd ../ffmpeg && $(MAKE) $(AM_MAKEFLAGS) distclean
-
-dist-hook: clean-local
-
-
diff --git a/src/plugins/thumbnailffmpeg/README b/src/plugins/thumbnailffmpeg/README
deleted file mode 100644
index 297adc8..0000000
--- a/src/plugins/thumbnailffmpeg/README
+++ /dev/null
@@ -1,105 +0,0 @@
-This is a thumbnail extractor using the ffmpeg libraries that will eventually
-support extracting thumbnails from both image and video files. Compiling
-the ffmpeg libraries requires at least GNU make version 3.81.
-
-A local ffmpeg tree is used, because
-(1) there are no recent official releases of the ffmpeg libs,
-(2) mainline ffmpeg is not reentrant,
-(3) security issues can be handled locally.
-
-Originally:
-svn export -r 13836 --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
-svn export -r 27100 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale
-sync with ffmpeg:
-FFREV=14311
-SWSREV=27332
-cd /tmp
-svn co -r $FFREV --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
-svn co -r $SWSREV svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale
-cd Extractor/src/plugins/thumbnailffmpeg
-# copy, rsync skips .svn dirs
-rsync -aC ffmpeg /tmp/
-cd /tmp/ffmpeg
-svn update
-<resolve conflicts>
-cd Extractor/src/plugins/thumbnailffmpeg
-rsync -aC /tmp/ffmpeg .
-# check for deletions
-diff -qr . /tmp/ffmpeg -x .svn
-<svn delete ...>
-# check for additions
-<svn status, svn add>
-
-update ffmpeg_distfiles.am:
-svn list -R src/plugins/ffmpeg | \
-  sed '/\/$/d' | \
-  sed '$!s/$/ \\/g' | \
-  sed 's/^/ffmpeg\//' | \
-  grep -v "no-indent" | \
-  sed '1 i EXTRA_DIST = \\' > src/plugins/ffmpeg_distfiles.am
-
-Plan: test & enable ffmpeg decoders one by one
-tests:
-- multithreading test
-- zzuf test
-- random input test
-(- valgrind)
-
-At least, the following should be eventually enabled:
-if ! ./configure                        \
-        --prefix=/tmp/FF                \
-        --disable-mmx                   \
-        --disable-altivec               \
-        --enable-shared                 \
-        --enable-swscale                \
-        --enable-gpl                    \
-        --disable-vhook                 \
-        --disable-postproc              \
-        --disable-network               \
-        --disable-ffmpeg                \
-        --disable-ffserver              \
-        --disable-ffplay                \
-        --disable-devices               \
-        --disable-protocols             \
-        --disable-bsfs                  \
-        --disable-parsers               \
-        --disable-muxers                \
-        --disable-demuxers              \
-        --disable-encoders              \
-        --disable-decoders              \
-        --enable-parser=h263            \
-        --enable-parser=h264            \
-        --enable-parser=mjpeg           \
-        --enable-parser=mpeg4video      \
-        --enable-parser=mpegvideo       \
-        --enable-encoder=png            \
-        --enable-encoder=mjpeg          \
-        --enable-decoder=bmp            \
-        --enable-decoder=pcx            \
-        --enable-decoder=png            \
-        --enable-decoder=mjpeg          \
-        --enable-decoder=mjpegb         \
-        --enable-decoder=targa          \
-        --enable-decoder=tiff           \
-        --enable-decoder=flashsv        \
-        --enable-decoder=h263           \
-        --enable-decoder=flv            \
-        --enable-decoder=h264           \
-        --enable-decoder=mpeg1video     \
-        --enable-decoder=mpeg2video     \
-        --enable-decoder=mpegvideo      \
-        --enable-decoder=mpeg4          \
-        --enable-decoder=vp6            \
-        --enable-decoder=vp6a           \
-        --enable-decoder=vp6f           \
-        --enable-demuxer=asf            \
-        --enable-demuxer=avi            \
-        --enable-demuxer=flv            \
-        --enable-demuxer=mjpeg          \
-        --enable-demuxer=mpegps         \
-        --enable-demuxer=mpegts         \
-        --enable-demuxer=mpegvideo      \
-        --enable-demuxer=mov            \
-        --enable-demuxer=ogg            \
-        --enable-demuxer=rm
-
diff --git a/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c b/src/plugins/thumbnailffmpeg_extractor.c
index 62f437d..7fbde2d 100644
--- a/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c
+++ b/src/plugins/thumbnailffmpeg_extractor.c
@@ -19,18 +19,28 @@
  */
 
 /**
- * @file thumbnailextractorffmpeg.c
+ * @file thumbnailffmpeg_extractor.c
  * @author Heikki Lindholm
  * @brief this extractor produces a binary encoded
  * thumbnail of images and videos using the ffmpeg libs.
  */
 
+/* This is a thumbnail extractor using the ffmpeg libraries that will eventually
+   support extracting thumbnails from both image and video files. 
+
+   Note that ffmpeg has a few issues:
+   (1) there are no recent official releases of the ffmpeg libs
+   (2) ffmpeg has a history of having security issues (parser is not robust)
+
+   So this plugin cannot be recommended for system with high security
+   requirements. 
+*/
+
 #include "platform.h"
 #include "extractor.h"
-
-#include <avformat.h>
-#include <avcodec.h>
-#include <swscale.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 #define DEBUG 0
 
@@ -148,21 +158,19 @@ static const struct MimeToDecoderMapping m2d_map[] = {
 #define THUMBSIZE 128           /* max dimension in pixels */
 #define MAX_THUMB_SIZE (100*1024)       /* in bytes */
 
-struct EXTRACTOR_Keywords *
-libextractor_thumbnailffmpeg_extract (const char *filename,
-                                      const unsigned char *data,
-                                      size_t size,
-                                      struct EXTRACTOR_Keywords *prev)
+int 
+EXTRACTOR_thumbnailffmpeg_extract (const unsigned char *data,
+                                   size_t size,
+                                   EXTRACTOR_MetaDataProcessor proc,
+                                   void *proc_cls,
+                                   const char *options)
 {
   int score;
-
   AVInputFormat *fmt;
   AVProbeData pdat;
-
   ByteIOContext *bio_ctx = NULL;
   uint8_t *bio_buffer;
   struct StreamDescriptor reader_state;
-
   AVFormatContext *format_ctx = NULL;
   AVCodecContext *codec_ctx = NULL;
   AVPacket packet;
@@ -515,14 +523,14 @@ out:
   return prev;
 }
 
-struct EXTRACTOR_Keywords *
-libextractor_thumbnail_extract (const char *filename,
-                                const unsigned char *data,
-                                size_t size,
-                                struct EXTRACTOR_Keywords *prev,
-                                const char *options)
+int 
+EXTRACTOR_thumbnail_extract (const unsigned char *data,
+                             size_t size,
+                             EXTRACTOR_MetaDataProcessor proc,
+                             void *proc_cls,
+                             const char *options)
 {
-  return libextractor_thumbnailffmpeg_extract (filename, data, size, prev);
+  return EXTRACTOR_thumbnailffmpeg_extract (data, size, proc, proc_cls, options);
 }
 
-/* end of thumbnailextractorffmpeg.c */
+/* end of thumbnailffmpeg_extractor.c */