[tracker/use-libmediaart] WIP

[Martyn James Russell <mr src gnome org>]

commit a4e7437696b518d39ac7398204a0d4f43500a24f
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jan 23 17:18:30 2014 +0000

    WIP

 configure.ac                              |   11 +-
 src/libtracker-common/Makefile.am         |    6 +-
 src/libtracker-common/tracker-media-art.c |  322 -----------------------------
 src/libtracker-common/tracker-media-art.h |   42 ----
 src/libtracker-miner/tracker-media-art.c  |   19 +-
 5 files changed, 19 insertions(+), 381 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a8d3175..de4cb8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,7 @@ NETWORK_MANAGER_REQUIRED=0.8
 GSTREAMER_REQUIRED=0.10.31
 GUPNP_DLNA_REQUIRED=0.9.4
 LIBPNG_REQUIRED=0.89
+LIBMEDIAART_REQUIRED=0.1.0
 
 # 3.6.11 for sqlite_backup API
 # 3.6.16 to fix test failures
@@ -228,8 +229,9 @@ LIBTRACKER_BUS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 PKG_CHECK_MODULES(LIBTRACKER_BUS, [$LIBTRACKER_BUS_REQUIRED])
 
 # Check requirements for libtracker-common
-LIBTRACKER_COMMON_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
-                            gio-unix-2.0 >= $GLIB_REQUIRED"
+LIBTRACKER_COMMON_REQUIRED="glib-2.0        >= $GLIB_REQUIRED
+                            gio-unix-2.0    >= $GLIB_REQUIRED
+                            libmediaart-1.0 >= $LIBMEDIAART_REQUIRED"
 
 PKG_CHECK_MODULES(LIBTRACKER_COMMON, [$LIBTRACKER_COMMON_REQUIRED])
 
@@ -269,8 +271,9 @@ LIBTRACKER_FTS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
 
 # Check requirements for libtracker-miner
-LIBTRACKER_MINER_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
-                           gio-unix-2.0 >= $GLIB_REQUIRED"
+LIBTRACKER_MINER_REQUIRED="glib-2.0        >= $GLIB_REQUIRED
+                           gio-unix-2.0    >= $GLIB_REQUIRED
+                           libmediaart-1.0 >= $LIBMEDIAART_REQUIRED"
 
 PKG_CHECK_MODULES(LIBTRACKER_MINER, [$LIBTRACKER_MINER_REQUIRED])
 
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 1ef66bf..69b9ce1 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -29,8 +29,7 @@ libtracker_common_la_SOURCES = \
        tracker-type-utils.c \
        tracker-utils.c \
        tracker-crc32.c \
-       tracker-locale.c \
-       tracker-media-art.c
+       tracker-locale.c
 
 noinst_HEADERS = \
        tracker-dbus.h \
@@ -48,8 +47,7 @@ noinst_HEADERS = \
        tracker-type-utils.h \
        tracker-utils.h \
        tracker-crc32.h \
-       tracker-locale.h \
-       tracker-media-art.h
+       tracker-locale.h
 
 if HAVE_TRACKER_FTS
 libtracker_common_la_SOURCES += tracker-language.c
diff --git a/src/libtracker-miner/tracker-media-art.c b/src/libtracker-miner/tracker-media-art.c
index fb92d24..b1abefc 100644
--- a/src/libtracker-miner/tracker-media-art.c
+++ b/src/libtracker-miner/tracker-media-art.c
@@ -24,7 +24,8 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <libtracker-common/tracker-media-art.h>
+#include <libmediaart/mediaart.h>
+
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-media-art.h"
@@ -90,18 +91,18 @@ on_query_finished (GObject      *source_object,
                artist = tracker_sparql_cursor_get_value_type (cursor, 1) != 
TRACKER_SPARQL_VALUE_TYPE_UNBOUND ? tracker_sparql_cursor_get_string (cursor, 1, NULL) : NULL;
 
                /* The get_path API does stripping itself */
-               tracker_media_art_get_path (artist,
-                                           album,
-                                           "album", NULL,
-                                           &target, NULL);
+               media_art_get_path (artist,
+                                   album,
+                                   "album", NULL,
+                                   &target, NULL);
 
                g_hash_table_replace (table, target, target);
 
                /* Also add the file to which the symlinks are made */
-               tracker_media_art_get_path (NULL,
-                                           album,
-                                           "album", NULL,
-                                           &album_path, NULL);
+               media_art_get_path (NULL,
+                                   album,
+                                   "album", NULL,
+                                   &album_path, NULL);
 
 
                g_hash_table_replace (table, album_path, album_path);