GNOME.org
 

[tracker/extractor-dev: 4/17] tracker-extract: Removed unused defines

commit 088ba867ceb751bf363235f6268223f65a13b758
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Mar 9 11:25:26 2010 +0000

    tracker-extract: Removed unused defines

 src/tracker-extract/tracker-extract-abw.c         |    7 -------
 src/tracker-extract/tracker-extract-gstreamer.c   |    8 --------
 src/tracker-extract/tracker-extract-html.c        |    2 --
 src/tracker-extract/tracker-extract-imagemagick.c |    9 ---------
 src/tracker-extract/tracker-extract-libxine.c     |    9 ---------
 src/tracker-extract/tracker-extract-mplayer.c     |    9 ---------
 src/tracker-extract/tracker-extract-oasis.c       |    7 -------
 src/tracker-extract/tracker-extract-playlist.c    |    5 -----
 src/tracker-extract/tracker-extract-png.c         |    8 --------
 src/tracker-extract/tracker-extract-tiff.c        |    7 -------
 src/tracker-extract/tracker-extract-totem.c       |    9 ---------
 src/tracker-extract/tracker-extract-vorbis.c      |    9 ++-------
 12 files changed, 2 insertions(+), 87 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index 6f55184..c354e69 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -38,13 +38,6 @@
 
 #include <libtracker-extract/tracker-extract.h>
 
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 static void extract_abw (const gchar          *uri,
                          TrackerSparqlBuilder *preupdate,
                          TrackerSparqlBuilder *metadata);
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 158adcb..0d1c2d9 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -52,14 +52,6 @@ long long int llroundl(long double x);
 #define GST_TAG_CLASSIFICATION "classification"
 #endif
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 /* Some additional tagreadbin tags (FIXME until they are defined upstream)*/
 #ifndef GST_TAG_CHANNEL
 #define GST_TAG_CHANNEL "channels"
diff --git a/src/tracker-extract/tracker-extract-html.c b/src/tracker-extract/tracker-extract-html.c
index dff214e..0634075 100644
--- a/src/tracker-extract/tracker-extract-html.c
+++ b/src/tracker-extract/tracker-extract-html.c
@@ -30,8 +30,6 @@
 
 #include <libtracker-extract/tracker-extract.h>
 
-#define RDF_TYPE TRACKER_RDF_PREFIX "type"
-
 typedef enum {
 	READ_TITLE,
 } tag_type;
diff --git a/src/tracker-extract/tracker-extract-imagemagick.c b/src/tracker-extract/tracker-extract-imagemagick.c
index 95beb45..837fa5a 100644
--- a/src/tracker-extract/tracker-extract-imagemagick.c
+++ b/src/tracker-extract/tracker-extract-imagemagick.c
@@ -31,15 +31,6 @@
 
 #include <libtracker-extract/tracker-extract.h>
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 static void extract_imagemagick (const gchar          *uri,
                                  TrackerSparqlBuilder *preupdate,
                                  TrackerSparqlBuilder *metadata);
diff --git a/src/tracker-extract/tracker-extract-libxine.c b/src/tracker-extract/tracker-extract-libxine.c
index dc83b90..fec65f4 100644
--- a/src/tracker-extract/tracker-extract-libxine.c
+++ b/src/tracker-extract/tracker-extract-libxine.c
@@ -28,15 +28,6 @@
 
 #include <libtracker-extract/tracker-extract.h>
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 static void
 tracker_extract_xine (const gchar          *uri,
                       TrackerSparqlBuilder *preupdate,
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index 4c0c114..6154bec 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -31,15 +31,6 @@
 
 #include <libtracker-extract/tracker-extract.h>
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 static void extract_mplayer (const gchar          *uri,
                              TrackerSparqlBuilder *preupdate,
                              TrackerSparqlBuilder *metadata);
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index 3b532bb..1cd098d 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -31,13 +31,6 @@
 
 #include "tracker-main.h"
 
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 typedef enum {
 	READ_TITLE,
 	READ_SUBJECT,
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index ac7096a..68dbb34 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -47,11 +47,6 @@
 #define PLAYLIST_DEFAULT_NO_TRACKS 0
 #define PLAYLIST_DEFAULT_DURATION 0
 
-
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 typedef struct {
 	guint32 track_counter;
 	gint64 total_time;
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index b2989a5..d2ce761 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -46,14 +46,6 @@
 
 #define RFC1123_DATE_FORMAT "%d %B %Y %H:%M:%S %z"
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-
 typedef struct {
 	gchar *title, *copyright, *creator, *description, *date, *license;
 	gchar *artist;
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 8048ecd..3927f2f 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -41,13 +41,6 @@
 
 #define EXIF_DATE_FORMAT        "%Y:%m:%d %H:%M:%S"
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-
 typedef enum {
 	TIFF_TAGTYPE_UNDEFINED = 0,
 	TIFF_TAGTYPE_STRING,
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index 2d560b2..dd3d2f8 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -28,15 +28,6 @@
 
 #include <libtracker-extract/tracker-extract.h>
 
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-
-#define RDF_PREFIX TRACKER_RDF_PREFIX
-#define RDF_TYPE RDF_PREFIX "type"
-
 static const gchar *tags[][2] = {
 	{ "TOTEM_INFO_VIDEO_HEIGHT",            "nfo:height"    },
 	{ "TOTEM_INFO_VIDEO_WIDTH",             "nfo:width"     },
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index 89f4f8d..4cd1b43 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -32,14 +32,9 @@
 #include <libtracker-common/tracker-ontologies.h>
 #include <libtracker-common/tracker-utils.h>
 
-#include <libtracker-extract/tracker-extract.h>
+#include <libtracker-client/tracker.h>
 
-#define NIE_PREFIX TRACKER_NIE_PREFIX
-#define NFO_PREFIX TRACKER_NFO_PREFIX
-#define DC_PREFIX TRACKER_DC_PREFIX
-#define NCO_PREFIX TRACKER_NCO_PREFIX
-#define NMM_PREFIX TRACKER_NMM_PREFIX
-#define RDF_PREFIX TRACKER_RDF_PREFIX
+#include <libtracker-extract/tracker-extract.h>
 
 static void extract_vorbis (const char            *uri,
                             TrackerSparqlBuilder  *preupdate,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]