2 files changed, 21 insertions, 47 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3858ffc..03dc995 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -102,6 +102,7 @@ plugin_LTLIBRARIES = \
   libextractor_real.la \
   libextractor_riff.la \
   $(rpm) \
+  libextractor_s3m.la \
   libextractor_sid.la \
   libextractor_tar.la \
   $(thumbgtk) \
@@ -290,6 +291,11 @@ libextractor_rpm_la_LDFLAGS = \
 libextractor_rpm_la_LIBADD = \
   -lrpm
 
+libextractor_s3m_la_SOURCES = \
+  s3m_extractor.c 
+libextractor_s3m_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+
 libextractor_sid_la_SOURCES = \
   sid_extractor.c 
 libextractor_sid_la_LDFLAGS = \
@@ -349,7 +355,6 @@ OLD_LIBS = \
   $(extrampeg) \
   libextractor_nsf.la \
   libextractor_nsfe.la \
-  libextractor_s3m.la \
   libextractor_tar.la \
   $(thumbqt) \
   libextractor_xm.la \
@@ -392,13 +397,6 @@ libextractor_nsfe_la_LDFLAGS = \
 libextractor_nsfe_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la
 
-libextractor_s3m_la_SOURCES = \
-  s3mextractor.c 
-libextractor_s3m_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_s3m_la_LIBADD = \
-  $(top_builddir)/src/main/libextractor.la
-
 libextractor_thumbnailqt_la_SOURCES = \
   thumbnailextractorqt.cc
 libextractor_thumbnailqt_la_LDFLAGS = \
diff --git a/src/plugins/s3mextractor.c b/src/plugins/s3m_extractor.c
index 379bf57..7e8ae40 100644
--- a/src/plugins/s3mextractor.c
+++ b/src/plugins/s3m_extractor.c
@@ -32,19 +32,7 @@ struct header
   char magicid[4];
 };
 
-
-static struct EXTRACTOR_Keywords *addkword
-  (EXTRACTOR_KeywordList * oldhead,
-   const char *phrase, EXTRACTOR_KeywordType type)
-{
-  EXTRACTOR_KeywordList *keyword;
-
-  keyword = malloc (sizeof (EXTRACTOR_KeywordList));
-  keyword->next = oldhead;
-  keyword->keyword = strdup (phrase);
-  keyword->keywordType = type;
-  return (keyword);
-}
+#define ADD(s,t) do { if (0 != proc (proc_cls, "s3m", t, EXTRACTOR_METAFORMAT_UTF8, "text/plain", s, strlen(s)+1)) return 1; } while (0)
 
 
 /* "extract" keyword from a Scream Tracker 3 Module
@@ -54,39 +42,27 @@ static struct EXTRACTOR_Keywords *addkword
  * written.
  *
  */
-struct EXTRACTOR_Keywords *libextractor_s3m_extract
-  (const char *filename,
-   char *data, size_t size, struct EXTRACTOR_Keywords *prev)
+int 
+EXTRACTOR_s3m_extract (const unsigned char *data,
+                       size_t size,
+                       EXTRACTOR_MetaDataProcessor proc,
+                       void *proc_cls,
+                       const char *options)
 {
   char title[29];
-  struct header *head;
+  const struct header *head;
 
   /* Check header size */
 
-  if (size < HEADER_SIZE)
-    {
-      return (prev);
-    }
-
-  head = (struct header *) data;
-
-  /* Check "magic" id bytes */
-
+  if (size < HEADER_SIZE)    
+    return 0;    
+  head = (const struct header *) data;
   if (memcmp (head->magicid, "SCRM", 4))
-    {
-      return (prev);
-    }
-
-  /* Mime-type */
-
-  prev = addkword (prev, "audio/x-s3m", EXTRACTOR_MIMETYPE);
-
-  /* Song title */
+    return 0;
+  ADD ("audio/x-s3m", EXTRACTOR_METATYPE_MIMETYPE);
 
   memcpy (&title, head->title, 28);
   title[28] = '\0';
-  prev = addkword (prev, title, EXTRACTOR_TITLE);
-
-  return (prev);
-
+  ADD (title, EXTRACTOR_METATYPE_TITLE);
+  return 0;
 }