[tracker/extractor-dev: 3/17] libtracker-extract: Added tracker-extract.h to include other files
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/extractor-dev: 3/17] libtracker-extract: Added tracker-extract.h to include other files
- Date: Tue, 9 Mar 2010 17:45:42 +0000 (UTC)
commit 64f8139b61544d5473e458c25bd929587cbed36f
Author: Martyn Russell <martyn lanedo com>
Date: Tue Mar 9 11:11:26 2010 +0000
libtracker-extract: Added tracker-extract.h to include other files
This has been added for compatibility.
For now, we have removed the TRACKER_ENABLE_INTERNALS check for
libtracker-common so the extractor modules can be built, but ideally
those should not need to use libtracker-common.
.../libtracker-extract/tracker-extract-mockup.c | 1 -
src/libtracker-common/tracker-common.h | 9 -
src/libtracker-extract/Makefile.am | 4 +-
src/libtracker-extract/tracker-data.h | 184 ++++++++++++++++++++
src/libtracker-extract/tracker-exif.h | 5 +-
src/libtracker-extract/tracker-extract.h | 179 ++-----------------
src/libtracker-extract/tracker-iptc.h | 4 +
src/libtracker-extract/tracker-utils.h | 4 +-
src/libtracker-extract/tracker-xmp.h | 4 +
src/tracker-extract/tracker-extract-abw.c | 1 -
src/tracker-extract/tracker-extract-flac.c | 1 -
src/tracker-extract/tracker-extract-gstreamer.c | 1 -
src/tracker-extract/tracker-extract-html.c | 1 -
src/tracker-extract/tracker-extract-imagemagick.c | 2 -
src/tracker-extract/tracker-extract-jpeg.c | 4 -
src/tracker-extract/tracker-extract-libxine.c | 1 -
src/tracker-extract/tracker-extract-mp3.c | 1 -
src/tracker-extract/tracker-extract-mplayer.c | 1 -
src/tracker-extract/tracker-extract-msoffice.c | 1 -
src/tracker-extract/tracker-extract-oasis.c | 1 -
src/tracker-extract/tracker-extract-pdf.c | 2 -
src/tracker-extract/tracker-extract-playlist.c | 1 -
src/tracker-extract/tracker-extract-png.c | 3 -
src/tracker-extract/tracker-extract-ps.c | 1 -
src/tracker-extract/tracker-extract-text.c | 1 -
src/tracker-extract/tracker-extract-tiff.c | 4 -
src/tracker-extract/tracker-extract-totem.c | 1 -
src/tracker-extract/tracker-extract-vorbis.c | 1 -
src/tracker-extract/tracker-extract-xmp.c | 2 -
29 files changed, 218 insertions(+), 207 deletions(-)
---
diff --git a/examples/libtracker-extract/tracker-extract-mockup.c b/examples/libtracker-extract/tracker-extract-mockup.c
index 03879cc..00469d0 100644
--- a/examples/libtracker-extract/tracker-extract-mockup.c
+++ b/examples/libtracker-extract/tracker-extract-mockup.c
@@ -29,7 +29,6 @@
#include <gio/gio.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#include <libtracker-client/tracker.h>
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index a1fe4dd..9992bf3 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -22,12 +22,6 @@
#include <glib.h>
-G_BEGIN_DECLS
-
-#if !defined (TRACKER_ENABLE_INTERNALS) && !defined (TRACKER_COMPILATION)
-#error "TRACKER_ENABLE_INTERNALS not defined, this must be defined to use tracker's internal functions"
-#endif
-
#define __LIBTRACKER_COMMON_INSIDE__
#include "tracker-class.h"
@@ -50,7 +44,4 @@ G_BEGIN_DECLS
#undef __LIBTRACKER_COMMON_INSIDE__
-
-G_END_DECLS
-
#endif /* __LIBTRACKER_COMMON_H__ */
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index b33dd86..61c6f7e 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -19,7 +19,7 @@ lib_LTLIBRARIES = libtracker-extract- TRACKER_API_VERSION@.la
libtracker_extractincdir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-extract/
libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES = \
- tracker-extract.h \
+ tracker-data.h \
tracker-exif.c \
tracker-exif.h \
tracker-iptc.c \
@@ -31,7 +31,7 @@ libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES = \
noinst_HEADERS =
libtracker_extractinc_HEADERS = \
- tracker-extract.h \
+ tracker-data.h \
tracker-exif.h \
tracker-iptc.h \
tracker-xmp.h \
diff --git a/src/libtracker-extract/tracker-data.h b/src/libtracker-extract/tracker-data.h
new file mode 100644
index 0000000..e5a8e68
--- /dev/null
+++ b/src/libtracker-extract/tracker-data.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2010, Nokia
+ *
+ * This program 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 of the License, or (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __LIBTRACKER_EXTRACT_EXTRACTOR_H__
+#define __LIBTRACKER_EXTRACT_EXTRACTOR_H__
+
+#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-extract/tracker-extract.h> must be included directly."
+#endif
+
+#include <glib.h>
+
+#include <libtracker-client/tracker-sparql-builder.h>
+
+G_BEGIN_DECLS
+
+/**
+ * SECTION:tracker-extract
+ * @short_description: How to use libtracker-extract
+ * @stability: Stable
+ * @include: libtracker-extract/tracker-extract.h
+ *
+ * The libtracker-extract library is the foundation for Tracker
+ * metadata extraction of embedded data in files.
+ *
+ * Tracker comes with extractors written for the most common file
+ * types (like MP3, JPEG, PNG, etc.), however, for more special cases,
+ * 3rd party applications may want to write their own plugin to
+ * extract their own file formats. This documentation describes how to
+ * do that.
+ *
+ * <example>
+ * <title>Basic extractor example</title>
+ * An example of how to write an extractor to retrieve PNG embedded
+ * metadata.
+ * <programlisting>
+ * static void extract_png (const gchar *filename,
+ * TrackerSparqlBuilder *preupdate,
+ * TrackerSparqlBuilder *metadata);
+ *
+ * /* Set functions to use to extract different mime types. */
+ * static TrackerExtractData extract_data[] = {
+ * { "image/png", extract_png },
+ * { "sketch/png", extract_png },
+ * { NULL, NULL }
+ * };
+ *
+ * static void
+ * extract_png (const gchar *uri,
+ * TrackerSparqlBuilder *preupdate,
+ * TrackerSparqlBuilder *metadata)
+ * {
+ * gint height, width;
+ *
+ * /* Do data extraction. */
+ * height = ...
+ * width = ...
+ *
+ * /* Insert data into TrackerSparqlBuilder object. */
+ * tracker_sparql_builder_predicate (metadata, "a");
+ * tracker_sparql_builder_object (metadata, "nfo:Image");
+ * tracker_sparql_builder_object (metadata, "nmm:Photo");
+ *
+ * tracker_sparql_builder_predicate (metadata, "nfo:width");
+ * tracker_sparql_builder_object_int64 (metadata, width);
+ *
+ * tracker_sparql_builder_predicate (metadata, "nfo:height");
+ * tracker_sparql_builder_object_int64 (metadata, height);
+ *
+ * g_free (filename);
+ * }
+ *
+ * TrackerExtractData *
+ * tracker_extract_get_data (void)
+ * {
+ * return extract_data;
+ * }
+ * </programlisting>
+ * </example>
+ *
+ */
+
+
+/**
+ * TrackerExtractMimeFunc:
+ * @uri: a string representing a URI.
+ * @preupdate: used to populate with data updates that
+ * are a prerequisite for the actual file
+ * metadata insertion.
+ * @metadata: used to populate with file metadata predicate/object(s).
+ *
+ * Extracts metadata from a file, and inserts it into @metadata.
+ *
+ * The @metadata parameter is a #TrackerSparqlBuilder constructed
+ * through tracker_sparql_builder_new_embedded_insert(), the subject
+ * is already set to be the file URN, so implementations of this
+ * function should just provide predicate/object(s) pairs. the data
+ * triples contained in there at the end of the function will be
+ * merged with further file information from miners.
+ *
+ * Whenever any of the inserted triples rely on entities that
+ * should also be provided by this extractor (for example, album
+ * or artist information from a song), such insertions should be
+ * added to @preupdate, which is a #TrackerSparqlBuilder constructed.
+ * through tracker_sparql_builder_new_update().
+ *
+ * Since: 0.8
+ **/
+typedef void (*TrackerExtractMimeFunc) (const gchar *uri,
+ TrackerSparqlBuilder *preupdate,
+ TrackerSparqlBuilder *metadata);
+
+/**
+ * TrackerExtractData:
+ * @mime: a string pointer representing a mime type.
+ * @func: a function to extract extract the data in.
+ *
+ * The @mime is usually in the format of "image/png" for example.
+
+ * The @func is called by tracker-extract if an extractor plugin
+ * matches the @mime.
+ *
+ * Since: 0.8
+ **/
+typedef struct {
+ const gchar *mime;
+ TrackerExtractMimeFunc func;
+} TrackerExtractData;
+
+/**
+ * TrackerExtractDataFunc:
+ *
+ * This function is used by by tracker-extract to call into each
+ * extractor to get a list of mime type and TrackerExtractMimeFunc
+ * combinations.
+ *
+ * Returns: an array of #TrackerExtractData which must be NULL
+ * terminated and must NOT be freed.
+ *
+ * Since: 0.6
+ **/
+typedef TrackerExtractData * (*TrackerExtractDataFunc) (void);
+
+/**
+ * tracker_extract_get_data:
+ *
+ *
+ * This function must be provided by ALL extractors. This is merely
+ * the declaration of the function which must be written by each
+ * extractor.
+ *
+ * This is checked by tracker-extract by looking up the symbols for
+ * each plugin and making sure this function exists. This is only
+ * called by tracker-extract if a mime type in any of the
+ * #TrackerExtractData structures returned matches the mime type of
+ * the file being handled.
+ *
+ * Returns: a #TrackerExtractData pointer which should not be freed.
+ * This pointer can be an array of #TrackerExtractData structures
+ * where multiple mime types are supported.
+ *
+ * Since: 0.8
+ */
+TrackerExtractData *tracker_extract_get_data (void);
+
+G_END_DECLS
+
+#endif /* __LIBTRACKER_EXTRACT_EXTRACTOR_H__ */
diff --git a/src/libtracker-extract/tracker-exif.h b/src/libtracker-extract/tracker-exif.h
index 5df6de4..b14f78b 100644
--- a/src/libtracker-extract/tracker-exif.h
+++ b/src/libtracker-extract/tracker-exif.h
@@ -22,6 +22,10 @@
#ifndef __LIBTRACKER_EXTRACT_EXIF_H__
#define __LIBTRACKER_EXTRACT_EXIF_H__
+#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-extract/tracker-extract.h> must be included directly."
+#endif
+
#include <glib.h>
G_BEGIN_DECLS
@@ -58,4 +62,3 @@ gboolean tracker_extract_exif_read (const unsigned char *buffer,
G_END_DECLS
#endif /* __LIBTRACKER_EXTRACT_EXIF_H__ */
-
diff --git a/src/libtracker-extract/tracker-extract.h b/src/libtracker-extract/tracker-extract.h
index 88eece1..4c371cc 100644
--- a/src/libtracker-extract/tracker-extract.h
+++ b/src/libtracker-extract/tracker-extract.h
@@ -1,180 +1,35 @@
/*
* Copyright (C) 2010, Nokia
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKER_EXTRACT_EXTRACT_H__
-#define __LIBTRACKER_EXTRACT_EXTRACT_H__
+#ifndef __LIBTRACKER_EXTRACT_H__
+#define __LIBTRACKER_EXTRACT_H__
#include <glib.h>
-#include <libtracker-client/tracker-sparql-builder.h>
+#define __LIBTRACKER_EXTRACT_INSIDE__
-G_BEGIN_DECLS
+#include "tracker-data.h"
+#include "tracker-exif.h"
+#include "tracker-iptc.h"
+#include "tracker-utils.h"
+#include "tracker-xmp.h"
-/**
- * SECTION:tracker-extract
- * @short_description: How to use libtracker-extract
- * @stability: Stable
- * @include: libtracker-extract/tracker-extract.h
- *
- * The libtracker-extract library is the foundation for Tracker
- * metadata extraction of embedded data in files.
- *
- * Tracker comes with extractors written for the most common file
- * types (like MP3, JPEG, PNG, etc.), however, for more special cases,
- * 3rd party applications may want to write their own plugin to
- * extract their own file formats. This documentation describes how to
- * do that.
- *
- * <example>
- * <title>Basic extractor example</title>
- * An example of how to write an extractor to retrieve PNG embedded
- * metadata.
- * <programlisting>
- * static void extract_png (const gchar *filename,
- * TrackerSparqlBuilder *preupdate,
- * TrackerSparqlBuilder *metadata);
- *
- * /* Set functions to use to extract different mime types. */
- * static TrackerExtractData extract_data[] = {
- * { "image/png", extract_png },
- * { "sketch/png", extract_png },
- * { NULL, NULL }
- * };
- *
- * static void
- * extract_png (const gchar *uri,
- * TrackerSparqlBuilder *preupdate,
- * TrackerSparqlBuilder *metadata)
- * {
- * gint height, width;
- *
- * /* Do data extraction. */
- * height = ...
- * width = ...
- *
- * /* Insert data into TrackerSparqlBuilder object. */
- * tracker_sparql_builder_predicate (metadata, "a");
- * tracker_sparql_builder_object (metadata, "nfo:Image");
- * tracker_sparql_builder_object (metadata, "nmm:Photo");
- *
- * tracker_sparql_builder_predicate (metadata, "nfo:width");
- * tracker_sparql_builder_object_int64 (metadata, width);
- *
- * tracker_sparql_builder_predicate (metadata, "nfo:height");
- * tracker_sparql_builder_object_int64 (metadata, height);
- *
- * g_free (filename);
- * }
- *
- * TrackerExtractData *
- * tracker_extract_get_data (void)
- * {
- * return extract_data;
- * }
- * </programlisting>
- * </example>
- *
- */
-
-
-/**
- * TrackerExtractMimeFunc:
- * @uri: a string representing a URI.
- * @preupdate: used to populate with data updates that
- * are a prerequisite for the actual file
- * metadata insertion.
- * @metadata: used to populate with file metadata predicate/object(s).
- *
- * Extracts metadata from a file, and inserts it into @metadata.
- *
- * The @metadata parameter is a #TrackerSparqlBuilder constructed
- * through tracker_sparql_builder_new_embedded_insert(), the subject
- * is already set to be the file URN, so implementations of this
- * function should just provide predicate/object(s) pairs. the data
- * triples contained in there at the end of the function will be
- * merged with further file information from miners.
- *
- * Whenever any of the inserted triples rely on entities that
- * should also be provided by this extractor (for example, album
- * or artist information from a song), such insertions should be
- * added to @preupdate, which is a #TrackerSparqlBuilder constructed.
- * through tracker_sparql_builder_new_update().
- *
- * Since: 0.8
- **/
-typedef void (*TrackerExtractMimeFunc) (const gchar *uri,
- TrackerSparqlBuilder *preupdate,
- TrackerSparqlBuilder *metadata);
-
-/**
- * TrackerExtractData:
- * @mime: a string pointer representing a mime type.
- * @func: a function to extract extract the data in.
- *
- * The @mime is usually in the format of "image/png" for example.
-
- * The @func is called by tracker-extract if an extractor plugin
- * matches the @mime.
- *
- * Since: 0.8
- **/
-typedef struct {
- const gchar *mime;
- TrackerExtractMimeFunc func;
-} TrackerExtractData;
-
-/**
- * TrackerExtractDataFunc:
- *
- * This function is used by by tracker-extract to call into each
- * extractor to get a list of mime type and TrackerExtractMimeFunc
- * combinations.
- *
- * Returns: an array of #TrackerExtractData which must be NULL
- * terminated and must NOT be freed.
- *
- * Since: 0.6
- **/
-typedef TrackerExtractData * (*TrackerExtractDataFunc) (void);
-
-/**
- * tracker_extract_get_data:
- *
- *
- * This function must be provided by ALL extractors. This is merely
- * the declaration of the function which must be written by each
- * extractor.
- *
- * This is checked by tracker-extract by looking up the symbols for
- * each plugin and making sure this function exists. This is only
- * called by tracker-extract if a mime type in any of the
- * #TrackerExtractData structures returned matches the mime type of
- * the file being handled.
- *
- * Returns: a #TrackerExtractData pointer which should not be freed.
- * This pointer can be an array of #TrackerExtractData structures
- * where multiple mime types are supported.
- *
- * Since: 0.8
- */
-TrackerExtractData *tracker_extract_get_data (void);
-
-G_END_DECLS
+#undef __LIBTRACKER_EXTRACT_INSIDE__
-#endif /* __LIBTRACKER_EXTRACT_EXTRACT_H__ */
+#endif /* __LIBTRACKER_EXTRACT_H__ */
diff --git a/src/libtracker-extract/tracker-iptc.h b/src/libtracker-extract/tracker-iptc.h
index cdd9e7b..0c87660 100644
--- a/src/libtracker-extract/tracker-iptc.h
+++ b/src/libtracker-extract/tracker-iptc.h
@@ -22,6 +22,10 @@
#ifndef __LIBTRACKER_EXTRACT_IPTC_H__
#define __LIBTRACKER_EXTRACT_IPTC_H__
+#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-extract/tracker-extract.h> must be included directly."
+#endif
+
#include <glib.h>
/* IPTC Information Interchange Model */
diff --git a/src/libtracker-extract/tracker-utils.h b/src/libtracker-extract/tracker-utils.h
index ab114fc..51336b3 100644
--- a/src/libtracker-extract/tracker-utils.h
+++ b/src/libtracker-extract/tracker-utils.h
@@ -22,7 +22,9 @@
#ifndef __LIBTRACKER_EXTRACT_UTILS_H__
#define __LIBTRACKER_EXTRACT_UTILS_H__
-#include <glib.h>
+#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-extract/tracker-extract.h> must be included directly."
+#endif
/* These are for convenience */
#define tracker_coalesce tracker_extract_coalesce
diff --git a/src/libtracker-extract/tracker-xmp.h b/src/libtracker-extract/tracker-xmp.h
index 6d8d7aa..be2ef84 100644
--- a/src/libtracker-extract/tracker-xmp.h
+++ b/src/libtracker-extract/tracker-xmp.h
@@ -21,6 +21,10 @@
#ifndef __LIBTRACKER_EXTRACT_XMP_H__
#define __LIBTRACKER_EXTRACT_XMP_H__
+#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-extract/tracker-extract.h> must be included directly."
+#endif
+
#include <glib.h>
#include <libtracker-client/tracker-sparql-builder.h>
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index 6c0a0ba..6f55184 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -37,7 +37,6 @@
#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define NIE_PREFIX TRACKER_NIE_PREFIX
#define NFO_PREFIX TRACKER_NFO_PREFIX
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index 09e72d6..ecfe884 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -33,7 +33,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
typedef struct {
gchar *title;
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index f54e968..158adcb 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -40,7 +40,6 @@ long long int llroundl(long double x);
#include <libtracker-client/tracker.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#include "tracker-albumart.h"
#include "tracker-dbus.h"
diff --git a/src/tracker-extract/tracker-extract-html.c b/src/tracker-extract/tracker-extract-html.c
index ad8150e..dff214e 100644
--- a/src/tracker-extract/tracker-extract-html.c
+++ b/src/tracker-extract/tracker-extract-html.c
@@ -29,7 +29,6 @@
#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define RDF_TYPE TRACKER_RDF_PREFIX "type"
diff --git a/src/tracker-extract/tracker-extract-imagemagick.c b/src/tracker-extract/tracker-extract-imagemagick.c
index 881e62b..95beb45 100644
--- a/src/tracker-extract/tracker-extract-imagemagick.c
+++ b/src/tracker-extract/tracker-extract-imagemagick.c
@@ -30,8 +30,6 @@
#include <libtracker-common/tracker-os-dependant.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-extract/tracker-utils.h>
#define NMM_PREFIX TRACKER_NMM_PREFIX
#define NFO_PREFIX TRACKER_NFO_PREFIX
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index 86659f0..bc665b6 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -47,10 +47,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-extract/tracker-iptc.h>
-#include <libtracker-extract/tracker-exif.h>
-#include <libtracker-extract/tracker-utils.h>
#include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-libxine.c b/src/tracker-extract/tracker-extract-libxine.c
index 85897b5..dc83b90 100644
--- a/src/tracker-extract/tracker-extract-libxine.c
+++ b/src/tracker-extract/tracker-extract-libxine.c
@@ -27,7 +27,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define NMM_PREFIX TRACKER_NMM_PREFIX
#define NFO_PREFIX TRACKER_NFO_PREFIX
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index dd31256..4a5e605 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -48,7 +48,6 @@
#include <libtracker-client/tracker.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#include "tracker-albumart.h"
#include "tracker-dbus.h"
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index 14a7991..4c0c114 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -30,7 +30,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define NMM_PREFIX TRACKER_NMM_PREFIX
#define NFO_PREFIX TRACKER_NFO_PREFIX
diff --git a/src/tracker-extract/tracker-extract-msoffice.c b/src/tracker-extract/tracker-extract-msoffice.c
index 2d2d308..9cb7a8f 100644
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@ -38,7 +38,6 @@
#include <libtracker-common/tracker-os-dependant.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index 64f994e..3b532bb 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -28,7 +28,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index b651765..9ffced0 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -33,8 +33,6 @@
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-extract/tracker-utils.h>
#include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index f6b02f0..ac7096a 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -36,7 +36,6 @@
#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define PLAYLIST_PROPERTY_NO_TRACKS "entryCounter"
#define PLAYLIST_PROPERTY_DURATION "listDuration"
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 411f84c..b2989a5 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -43,9 +43,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-extract/tracker-exif.h>
-#include <libtracker-extract/tracker-utils.h>
#define RFC1123_DATE_FORMAT "%d %B %Y %H:%M:%S %z"
diff --git a/src/tracker-extract/tracker-extract-ps.c b/src/tracker-extract/tracker-extract-ps.c
index 3e422ea..4b053e1 100644
--- a/src/tracker-extract/tracker-extract-ps.c
+++ b/src/tracker-extract/tracker-extract-ps.c
@@ -40,7 +40,6 @@
#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#ifndef HAVE_GETLINE
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 0fa89ed..71ddeed 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -25,7 +25,6 @@
#include <gio/gio.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#undef TRY_LOCALE_TO_UTF8_CONVERSION
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 78c35d4..8048ecd 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -38,10 +38,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-extract/tracker-iptc.h>
-#include <libtracker-extract/tracker-exif.h>
-#include <libtracker-extract/tracker-utils.h>
#define EXIF_DATE_FORMAT "%Y:%m:%d %H:%M:%S"
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index fa51702..2d560b2 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -27,7 +27,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define NMM_PREFIX TRACKER_NMM_PREFIX
#define NFO_PREFIX TRACKER_NFO_PREFIX
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index 5815ca1..89f4f8d 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -33,7 +33,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-utils.h>
#define NIE_PREFIX TRACKER_NIE_PREFIX
#define NFO_PREFIX TRACKER_NFO_PREFIX
diff --git a/src/tracker-extract/tracker-extract-xmp.c b/src/tracker-extract/tracker-extract-xmp.c
index c7f1949..97f2f5e 100644
--- a/src/tracker-extract/tracker-extract-xmp.c
+++ b/src/tracker-extract/tracker-extract-xmp.c
@@ -28,8 +28,6 @@
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
-#include <libtracker-extract/tracker-xmp.h>
-#include <libtracker-extract/tracker-utils.h>
static void extract_xmp (const gchar *filename,
TrackerSparqlBuilder *preupdate,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
