[GNUnet-SVN] r31640 - in Extractor: . src/plugins

[gnunet]

Author: bratao
Date: 2013-12-21 00:49:40 +0100 (Sat, 21 Dec 2013)
New Revision: 31640

Modified:
   Extractor/AUTHORS
   Extractor/src/plugins/previewopus_extractor.c
Log:
Remove unused libmagic and add as Author.

Modified: Extractor/AUTHORS
===================================================================
--- Extractor/AUTHORS   2013-12-20 23:27:59 UTC (rev 31639)
+++ Extractor/AUTHORS   2013-12-20 23:49:40 UTC (rev 31640)
@@ -5,6 +5,7 @@
 Developers:
 Andreas Huggel <address@hidden>
 Blake Matheny <address@hidden>
+Bruno Cabral <address@hidden>
 Bruno Haible <address@hidden>
 Christopher Adam Telfer
 Filip Pizlo <address@hidden>
@@ -56,6 +57,7 @@
 ole2           - Christian Grothoff
 ogg            - Christian Grothoff
 png            - Christian Grothoff
+previewopus - Bruno Cabral
 ps             - Christian Grothoff
 riff           - Christian Grothoff
 rpm            - Christian Grothoff

Modified: Extractor/src/plugins/previewopus_extractor.c
===================================================================
--- Extractor/src/plugins/previewopus_extractor.c       2013-12-20 23:27:59 UTC 
(rev 31639)
+++ Extractor/src/plugins/previewopus_extractor.c       2013-12-20 23:49:40 UTC 
(rev 31640)
@@ -106,12 +106,10 @@
 #define OUTPUT_SAMPLE_FORMAT AV_SAMPLE_FMT_S16
 
 
-/**
- * Global handle to MAGIC data.
- */
-static magic_t magic;
+/** Our output buffer*/
+static unsigned char *buffer;
 
-static unsigned char *buffer;
+/** Actual output buffer size */
 static int totalSize;
 
 /**
@@ -987,7 +985,6 @@
   frame_finished = 0;
 
 
-       
        /**
      * Loop as long as we have input samples to read or output samples
      * to write; abort as soon as we have neither.
@@ -1126,14 +1123,13 @@
   unsigned int i;
   ssize_t iret;
   void *data;
-  const char *mime;
 
+
   if (-1 == (iret = ec->read (ec->cls,
                              &data,
                              16 * 1024)))
     return;
-  if (NULL == (mime = magic_buffer (magic, data, iret)))
-    return;
+
   if (0 != ec->seek (ec->cls, 0, SEEK_SET))
     return;
 
@@ -1163,18 +1159,14 @@
 
 
 /**
- * Initialize av-libs and load magic file.
+ * Initialize av-libs
  */
 void __attribute__ ((constructor)) 
 previewopus_lib_init (void)
 {
   av_log_set_callback (&previewopus_av_log_callback);
   av_register_all ();
-  magic = magic_open (MAGIC_MIME_TYPE);
-  if (0 != magic_load (magic, NULL))
-    {
-      /* FIXME: how to deal with errors? */
-    }
+
 }
 
 
@@ -1184,11 +1176,7 @@
 void __attribute__ ((destructor)) 
 previewopus_ltdl_fini () 
 {
-  if (NULL != magic)
-    {
-      magic_close (magic);
-      magic = NULL;
-    }
+
 }