[GNUnet-SVN] r23606 - Extractor/src/plugins

[gnunet]

Author: grothoff
Date: 2012-09-04 13:06:38 +0200 (Tue, 04 Sep 2012)
New Revision: 23606

Modified:
   Extractor/src/plugins/test_gstreamer.c
Log:
code cleanup, dos2unix

Modified: Extractor/src/plugins/test_gstreamer.c
===================================================================
--- Extractor/src/plugins/test_gstreamer.c      2012-09-04 11:00:51 UTC (rev 
23605)
+++ Extractor/src/plugins/test_gstreamer.c      2012-09-04 11:06:38 UTC (rev 
23606)
@@ -24,94 +24,91 @@
  */
 #include "platform.h"
 #include "test_lib.h"
-
 #include <glib.h>
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-/* This is a miniaturized version of gst-discoverer, its only purpose is
+
+/**
+ * This is a miniaturized version of gst-discoverer, its only purpose is
  * to detect missing plugins situations and skip a test in such cases.
  */
-GstDiscovererResult
-discoverer_main (GstDiscoverer *dc, char *filename)
+static GstDiscovererResult
+discoverer_main (GstDiscoverer *dc, const char *filename)
 {
   GError *err = NULL;
-  GDir *dir;
-  gchar *uri, *path;
+  gchar *uri;
+  gchar *path;
   GstDiscovererInfo *info;
-
   GstDiscovererResult result;
 
-  if (!gst_uri_is_valid (filename)) {
-    if (!g_path_is_absolute (filename)) {
-      gchar *cur_dir;
-
-      cur_dir = g_get_current_dir ();
-      path = g_build_filename (cur_dir, filename, NULL);
-      g_free (cur_dir);
-    } else {
-      path = g_strdup (filename);
+  if (! gst_uri_is_valid (filename)) 
+    {
+      if (! g_path_is_absolute (filename)) 
+       {
+         gchar *cur_dir;
+         
+         cur_dir = g_get_current_dir ();
+         path = g_build_filename (cur_dir, filename, NULL);
+         g_free (cur_dir);
+       }
+      else 
+       {
+         path = g_strdup (filename);
+       }
+      
+      uri = g_filename_to_uri (path, NULL, &err);
+      g_free (path);
+      path = NULL;
+      
+      if (err) 
+       {
+         g_warning ("Couldn't convert filename %s to URI: %s\n", filename, 
err->message);
+         g_error_free (err);
+         return GST_DISCOVERER_ERROR;
+       }
     }
-
-    uri = g_filename_to_uri (path, NULL, &err);
-    g_free (path);
-    path = NULL;
-
-    if (err) {
-      g_warning ("Couldn't convert filename %s to URI: %s\n", filename, 
err->message);
-      g_error_free (err);
-      return;
+  else 
+    {
+      uri = g_strdup (filename);
     }
-  } else {
-    uri = g_strdup (filename);
-  }
-
   info = gst_discoverer_discover_uri (dc, uri, &err);
-
-  result = gst_discoverer_info_get_result (info);
-
-  switch (result) {
+  result = gst_discoverer_info_get_result (info);  
+  switch (result) 
+    {
     case GST_DISCOVERER_OK:
-    {
-      break;
-    }
+      break;      
     case GST_DISCOVERER_URI_INVALID:
-    {
       g_print ("URI %s is not valid\n", uri);
       break;
-    }
     case GST_DISCOVERER_ERROR:
-    {
       g_print ("An error was encountered while discovering the file %s\n", 
filename);
       g_print (" %s\n", err->message);
       break;
-    }
     case GST_DISCOVERER_TIMEOUT:
-    {
       g_print ("Analyzing URI %s timed out\n", uri);
-      break;
-    }
+      break;    
     case GST_DISCOVERER_BUSY:
-    {
       g_print ("Discoverer was busy\n");
-      break;
-    }
-    case GST_DISCOVERER_MISSING_PLUGINS:
-    {
+      break;    
+    case GST_DISCOVERER_MISSING_PLUGINS:      
       g_print ("Will skip %s: missing plugins\n", filename);
       break;
+    default:
+      g_print ("Unexpected result %d\n", result);
+      break;
     }
-  }
-
+  
   if (err)
     g_error_free (err);
   gst_discoverer_info_unref (info);
-
+  
   g_free (uri);
-
+  
   return result;
 }
 
+
 /**
  * Main function for the GStreamer testcase.
  *
@@ -123,24 +120,22 @@
 main (int argc, char *argv[])
 {
   GError *err = NULL;
-  gint timeout = 10;
   GstDiscoverer *dc;
-
   int result = 0;
   GstDiscovererResult pre_test;
 
   gst_init (&argc, &argv);
-
-  dc = gst_discoverer_new (timeout * GST_SECOND, &err);
-  if (G_UNLIKELY (dc == NULL)) {
-    g_print ("Error initializing: %s\n", err->message);
-    exit (1);
-  }
-  if (err)
+  dc = gst_discoverer_new (10 * GST_SECOND, &err);
+  if (NULL == dc) 
+    {
+      g_print ("Error initializing: %s\n", err->message);
+      return 0;
+    }
+  if (NULL != err)
     g_error_free (err);
 
   pre_test = discoverer_main (dc, "testdata/30_and_33.asf");
-  if (pre_test != GST_DISCOVERER_MISSING_PLUGINS)
+  if (GST_DISCOVERER_MISSING_PLUGINS != pre_test)
   {
     struct SolutionData thirty_and_thirtythree_sol[] =
       {
@@ -988,474 +983,474 @@
        strlen ("20") + 1,
        0
         },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PART_OFFSET=5",
-        strlen ("PART_OFFSET=5") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ARTIST/INSTRUMENTS=ARTIST/INSTRUMENTS",
-        strlen ("ARTIST/INSTRUMENTS=ARTIST/INSTRUMENTS") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "LEAD_PERFORMER=LEAD_PERFORMER",
-        strlen ("LEAD_PERFORMER=LEAD_PERFORMER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ARRANGER=ARRANGER",
-        strlen ("ARRANGER=ARRANGER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "LYRICIST=LYRICIST",
-        strlen ("LYRICIST=LYRICIST") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "DIRECTOR=DIRECTOR",
-        strlen ("DIRECTOR=DIRECTOR") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ASSISTANT_DIRECTOR=ASSISTANT_DIRECTOR",
-        strlen ("ASSISTANT_DIRECTOR=ASSISTANT_DIRECTOR") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "DIRECTOR_OF_PHOTOGRAPHY=DIRECTOR_OF_PHOTOGRAPHY",
-        strlen ("DIRECTOR_OF_PHOTOGRAPHY=DIRECTOR_OF_PHOTOGRAPHY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "SOUND_ENGINEER=SOUND_ENGINEER",
-        strlen ("SOUND_ENGINEER=SOUND_ENGINEER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ART_DIRECTOR=ART_DIRECTOR",
-        strlen ("ART_DIRECTOR=ART_DIRECTOR") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PRODUCTION_DESIGNER=PRODUCTION_DESIGNER",
-        strlen ("PRODUCTION_DESIGNER=PRODUCTION_DESIGNER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "CHOREGRAPHER=CHOREGRAPHER",
-        strlen ("CHOREGRAPHER=CHOREGRAPHER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "COSTUME_DESIGNER=COSTUME_DESIGNER",
-        strlen ("COSTUME_DESIGNER=COSTUME_DESIGNER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ACTOR=ACTOR",
-        strlen ("ACTOR=ACTOR") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "CHARACTER=CHARACTER",
-        strlen ("CHARACTER=CHARACTER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "WRITTEN_BY=WRITTEN_BY",
-        strlen ("WRITTEN_BY=WRITTEN_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "SCREENPLAY_BY=SCREENPLAY_BY",
-        strlen ("SCREENPLAY_BY=SCREENPLAY_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "EDITED_BY=EDITED_BY",
-        strlen ("EDITED_BY=EDITED_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PRODUCER=PRODUCER",
-        strlen ("PRODUCER=PRODUCER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "COPRODUCER=COPRODUCER",
-        strlen ("COPRODUCER=COPRODUCER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "EXECUTIVE_PRODUCER=EXECUTIVE_PRODUCER",
-        strlen ("EXECUTIVE_PRODUCER=EXECUTIVE_PRODUCER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "DISTRIBUTED_BY=DISTRIBUTED_BY",
-        strlen ("DISTRIBUTED_BY=DISTRIBUTED_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "MASTERED_BY=MASTERED_BY",
-        strlen ("MASTERED_BY=MASTERED_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "MIXED_BY=MIXED_BY",
-        strlen ("MIXED_BY=MIXED_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "REMIXED_BY=REMIXED_BY",
-        strlen ("REMIXED_BY=REMIXED_BY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PRODUCTION_STUDIO=PRODUCTION_STUDIO",
-        strlen ("PRODUCTION_STUDIO=PRODUCTION_STUDIO") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "THANKS_TO=THANKS_TO",
-        strlen ("THANKS_TO=THANKS_TO") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PUBLISHER=PUBLISHER",
-        strlen ("PUBLISHER=PUBLISHER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "LABEL=LABEL",
-        strlen ("LABEL=LABEL") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "MOOD=MOOD",
-        strlen ("MOOD=MOOD") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ORIGINAL_MEDIA_TYPE=ORIGINAL_MEDIA_TYPE",
-        strlen ("ORIGINAL_MEDIA_TYPE=ORIGINAL_MEDIA_TYPE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "CONTENT_TYPE=CONTENT_TYPE",
-        strlen ("CONTENT_TYPE=CONTENT_TYPE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "SUBJECT=SUBJECT",
-        strlen ("SUBJECT=SUBJECT") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "SUMMARY=SUMMARY",
-        strlen ("SUMMARY=SUMMARY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "SYNOPSIS=SYNOPSIS",
-        strlen ("SYNOPSIS=SYNOPSIS") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "INITIAL_KEY=INITIAL_KEY",
-        strlen ("INITIAL_KEY=INITIAL_KEY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PERIOD=PERIOD",
-        strlen ("PERIOD=PERIOD") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "LAW_RATING=LAW_RATING",
-        strlen ("LAW_RATING=LAW_RATING") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "COMPOSITION_LOCATION=COMPOSITION_LOCATION",
-        strlen ("COMPOSITION_LOCATION=COMPOSITION_LOCATION") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "COMPOSER_NATIONALITY=COMPOSER_NATIONALITY",
-        strlen ("COMPOSER_NATIONALITY=COMPOSER_NATIONALITY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PLAY_COUNTER=PLAY_COUNTER",
-        strlen ("PLAY_COUNTER=PLAY_COUNTER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "RATING=RATING",
-        strlen ("RATING=RATING") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ENCODER_SETTINGS=ENCODER_SETTINGS",
-        strlen ("ENCODER_SETTINGS=ENCODER_SETTINGS") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "FPS=FPS",
-        strlen ("FPS=FPS") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "MEASURE=MEASURE",
-        strlen ("MEASURE=MEASURE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "TUNING=TUNING",
-        strlen ("TUNING=TUNING") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ISBN=ISBN",
-        strlen ("ISBN=ISBN") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "BARCODE=BARCODE",
-        strlen ("BARCODE=BARCODE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "CATALOG_NUMBER=CATALOG_NUMBER",
-        strlen ("CATALOG_NUMBER=CATALOG_NUMBER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "LABEL_CODE=LABEL_CODE",
-        strlen ("LABEL_CODE=LABEL_CODE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "LCCN=LCCN",
-        strlen ("LCCN=LCCN") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PURCHASE_ITEM=PURCHASE_ITEM",
-        strlen ("PURCHASE_ITEM=PURCHASE_ITEM") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PURCHASE_INFO=PURCHASE_INFO",
-        strlen ("PURCHASE_INFO=PURCHASE_INFO") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PURCHASE_OWNER=PURCHASE_OWNER",
-        strlen ("PURCHASE_OWNER=PURCHASE_OWNER") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PURCHASE_PRICE=PURCHASE_PRICE",
-        strlen ("PURCHASE_PRICE=PURCHASE_PRICE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "PURCHASE_CURRENCY=PURCHASE_CURRENCY",
-        strlen ("PURCHASE_CURRENCY=PURCHASE_CURRENCY") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ORIGINAL/TITLE=ORIGINAL/TITLE",
-        strlen ("ORIGINAL/TITLE=ORIGINAL/TITLE") + 1,
-        0
-        },
-        {
-        EXTRACTOR_METATYPE_UNKNOWN,
-        EXTRACTOR_METAFORMAT_UTF8,
-        "text/plain",
-        "ORIGINAL/ARTIST/SORT_WITH=ORIGINAL/ARTIST/SORT_WITH",
-        strlen ("ORIGINAL/ARTIST/SORT_WITH=ORIGINAL/ARTIST/SORT_WITH") + 1,
-        0
-        },
         {
         EXTRACTOR_METATYPE_UNKNOWN,
         EXTRACTOR_METAFORMAT_UTF8,
         "text/plain",
+        "PART_OFFSET=5",
+        strlen ("PART_OFFSET=5") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ARTIST/INSTRUMENTS=ARTIST/INSTRUMENTS",
+        strlen ("ARTIST/INSTRUMENTS=ARTIST/INSTRUMENTS") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "LEAD_PERFORMER=LEAD_PERFORMER",
+        strlen ("LEAD_PERFORMER=LEAD_PERFORMER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ARRANGER=ARRANGER",
+        strlen ("ARRANGER=ARRANGER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "LYRICIST=LYRICIST",
+        strlen ("LYRICIST=LYRICIST") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "DIRECTOR=DIRECTOR",
+        strlen ("DIRECTOR=DIRECTOR") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ASSISTANT_DIRECTOR=ASSISTANT_DIRECTOR",
+        strlen ("ASSISTANT_DIRECTOR=ASSISTANT_DIRECTOR") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "DIRECTOR_OF_PHOTOGRAPHY=DIRECTOR_OF_PHOTOGRAPHY",
+        strlen ("DIRECTOR_OF_PHOTOGRAPHY=DIRECTOR_OF_PHOTOGRAPHY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "SOUND_ENGINEER=SOUND_ENGINEER",
+        strlen ("SOUND_ENGINEER=SOUND_ENGINEER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ART_DIRECTOR=ART_DIRECTOR",
+        strlen ("ART_DIRECTOR=ART_DIRECTOR") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PRODUCTION_DESIGNER=PRODUCTION_DESIGNER",
+        strlen ("PRODUCTION_DESIGNER=PRODUCTION_DESIGNER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "CHOREGRAPHER=CHOREGRAPHER",
+        strlen ("CHOREGRAPHER=CHOREGRAPHER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "COSTUME_DESIGNER=COSTUME_DESIGNER",
+        strlen ("COSTUME_DESIGNER=COSTUME_DESIGNER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ACTOR=ACTOR",
+        strlen ("ACTOR=ACTOR") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "CHARACTER=CHARACTER",
+        strlen ("CHARACTER=CHARACTER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "WRITTEN_BY=WRITTEN_BY",
+        strlen ("WRITTEN_BY=WRITTEN_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "SCREENPLAY_BY=SCREENPLAY_BY",
+        strlen ("SCREENPLAY_BY=SCREENPLAY_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "EDITED_BY=EDITED_BY",
+        strlen ("EDITED_BY=EDITED_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PRODUCER=PRODUCER",
+        strlen ("PRODUCER=PRODUCER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "COPRODUCER=COPRODUCER",
+        strlen ("COPRODUCER=COPRODUCER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "EXECUTIVE_PRODUCER=EXECUTIVE_PRODUCER",
+        strlen ("EXECUTIVE_PRODUCER=EXECUTIVE_PRODUCER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "DISTRIBUTED_BY=DISTRIBUTED_BY",
+        strlen ("DISTRIBUTED_BY=DISTRIBUTED_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "MASTERED_BY=MASTERED_BY",
+        strlen ("MASTERED_BY=MASTERED_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "MIXED_BY=MIXED_BY",
+        strlen ("MIXED_BY=MIXED_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "REMIXED_BY=REMIXED_BY",
+        strlen ("REMIXED_BY=REMIXED_BY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PRODUCTION_STUDIO=PRODUCTION_STUDIO",
+        strlen ("PRODUCTION_STUDIO=PRODUCTION_STUDIO") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "THANKS_TO=THANKS_TO",
+        strlen ("THANKS_TO=THANKS_TO") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PUBLISHER=PUBLISHER",
+        strlen ("PUBLISHER=PUBLISHER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "LABEL=LABEL",
+        strlen ("LABEL=LABEL") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "MOOD=MOOD",
+        strlen ("MOOD=MOOD") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ORIGINAL_MEDIA_TYPE=ORIGINAL_MEDIA_TYPE",
+        strlen ("ORIGINAL_MEDIA_TYPE=ORIGINAL_MEDIA_TYPE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "CONTENT_TYPE=CONTENT_TYPE",
+        strlen ("CONTENT_TYPE=CONTENT_TYPE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "SUBJECT=SUBJECT",
+        strlen ("SUBJECT=SUBJECT") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "SUMMARY=SUMMARY",
+        strlen ("SUMMARY=SUMMARY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "SYNOPSIS=SYNOPSIS",
+        strlen ("SYNOPSIS=SYNOPSIS") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "INITIAL_KEY=INITIAL_KEY",
+        strlen ("INITIAL_KEY=INITIAL_KEY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PERIOD=PERIOD",
+        strlen ("PERIOD=PERIOD") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "LAW_RATING=LAW_RATING",
+        strlen ("LAW_RATING=LAW_RATING") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "COMPOSITION_LOCATION=COMPOSITION_LOCATION",
+        strlen ("COMPOSITION_LOCATION=COMPOSITION_LOCATION") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "COMPOSER_NATIONALITY=COMPOSER_NATIONALITY",
+        strlen ("COMPOSER_NATIONALITY=COMPOSER_NATIONALITY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PLAY_COUNTER=PLAY_COUNTER",
+        strlen ("PLAY_COUNTER=PLAY_COUNTER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "RATING=RATING",
+        strlen ("RATING=RATING") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ENCODER_SETTINGS=ENCODER_SETTINGS",
+        strlen ("ENCODER_SETTINGS=ENCODER_SETTINGS") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "FPS=FPS",
+        strlen ("FPS=FPS") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "MEASURE=MEASURE",
+        strlen ("MEASURE=MEASURE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "TUNING=TUNING",
+        strlen ("TUNING=TUNING") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ISBN=ISBN",
+        strlen ("ISBN=ISBN") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "BARCODE=BARCODE",
+        strlen ("BARCODE=BARCODE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "CATALOG_NUMBER=CATALOG_NUMBER",
+        strlen ("CATALOG_NUMBER=CATALOG_NUMBER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "LABEL_CODE=LABEL_CODE",
+        strlen ("LABEL_CODE=LABEL_CODE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "LCCN=LCCN",
+        strlen ("LCCN=LCCN") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PURCHASE_ITEM=PURCHASE_ITEM",
+        strlen ("PURCHASE_ITEM=PURCHASE_ITEM") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PURCHASE_INFO=PURCHASE_INFO",
+        strlen ("PURCHASE_INFO=PURCHASE_INFO") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PURCHASE_OWNER=PURCHASE_OWNER",
+        strlen ("PURCHASE_OWNER=PURCHASE_OWNER") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PURCHASE_PRICE=PURCHASE_PRICE",
+        strlen ("PURCHASE_PRICE=PURCHASE_PRICE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "PURCHASE_CURRENCY=PURCHASE_CURRENCY",
+        strlen ("PURCHASE_CURRENCY=PURCHASE_CURRENCY") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ORIGINAL/TITLE=ORIGINAL/TITLE",
+        strlen ("ORIGINAL/TITLE=ORIGINAL/TITLE") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
+        "ORIGINAL/ARTIST/SORT_WITH=ORIGINAL/ARTIST/SORT_WITH",
+        strlen ("ORIGINAL/ARTIST/SORT_WITH=ORIGINAL/ARTIST/SORT_WITH") + 1,
+        0
+        },
+        {
+        EXTRACTOR_METATYPE_UNKNOWN,
+        EXTRACTOR_METAFORMAT_UTF8,
+        "text/plain",
         "ORIGINAL/ARTIST=ORIGINAL/ARTIST",
         strlen ("ORIGINAL/ARTIST=ORIGINAL/ARTIST") + 1,
         0
@@ -1667,7 +1662,7 @@
     result_patched = (0 == ET_main ("gstreamer", patched_ps) ? 0 : 1);
     g_print ("Patched GStreamer test result: %s\n", result_patched == 0 ? "OK" 
: "FAILED");
     if (result_stock && result_patched)
-      result += 1;
+      result++;
   }
   g_object_unref (dc);
   return result;