diff options
| -rw-r--r-- | libmediaart/Makefile.am | 6 | ||||
| -rw-r--r-- | libmediaart/cache.c (renamed from libmediaart/queue.c) | 32 | ||||
| -rw-r--r-- | libmediaart/cache.h (renamed from libmediaart/queue.h) | 15 | ||||
| -rw-r--r-- | libmediaart/mediaart.h | 2 |
4 files changed, 14 insertions, 41 deletions
diff --git a/libmediaart/Makefile.am b/libmediaart/Makefile.am index 73649fc..023846b 100644 --- a/libmediaart/Makefile.am +++ b/libmediaart/Makefile.am @@ -13,10 +13,10 @@ libmediaartdir = $(libdir)/libmediaart-$(LIBMEDIAART_API_VERSION)/ libmediaartincludedir=$(includedir)/libmediaart-$(LIBMEDIAART_API_VERSION)/ libmediaart_@LIBMEDIAART_API_VERSION@_la_SOURCES = \ + cache.c \ + cache.h \ utils.c \ utils.h \ - queue.c \ - queue.h \ extract.c \ extract.h \ extractgeneric.h \ @@ -24,8 +24,8 @@ libmediaart_@LIBMEDIAART_API_VERSION@_la_SOURCES = \ libmediaartinclude_HEADERS = \ mediaart.h \ + cache.h utils.h \ - queue.h \ extract.h \ extractgeneric.h diff --git a/libmediaart/queue.c b/libmediaart/cache.c index cf52f5e..b9e1081 100644 --- a/libmediaart/queue.c +++ b/libmediaart/cache.c @@ -35,34 +35,6 @@ * This is a convenience API using D-Bus to talk to the media management service. **/ - -/** - * media_art_remove_by_uri(): - * @uri: URI of the file - * @mime_type: mime-type of the file - * - * Adds a new request to tell the media art subsystem that @uri was removed. - * Stored requests can be processed with media_art_queue_empty(). - * - * Returns: #TRUE if successfully stored to be reported, #FALSE otherwise. - * - * Since: 0.2.0 - */ -gboolean -media_art_remove_by_uri (const gchar *uri, - const gchar *mime_type) -{ - /* mime_type can be NULL */ - - g_return_val_if_fail (uri != NULL, FALSE); - - if (mime_type && (g_str_has_prefix (mime_type, "video/") || g_str_has_prefix (mime_type, "audio/"))) { - had_any = TRUE; - } - - return TRUE; -} - /** * media_art_remove(): * @artist: Artist the media art belongs to @@ -74,7 +46,7 @@ media_art_remove_by_uri (const gchar *uri, * * Since: 0.2.0 */ -void +gboolean media_art_remove (const gchar *artist, const gchar *album) { @@ -84,6 +56,8 @@ media_art_remove (const gchar *artist, GDir *dir; gchar *dirname; GList *to_remove = NULL; + gchar *target = NULL; + gchar *album_path = NULL; g_return_if_fail (artist != NULL && artist[0] != '\0'); diff --git a/libmediaart/queue.h b/libmediaart/cache.h index b57f2b5..83b7551 100644 --- a/libmediaart/queue.h +++ b/libmediaart/cache.h @@ -17,10 +17,10 @@ * 02110-1301 USA */ -#ifndef __LIBMEDIAART_QUEUE_H__ -#define __LIBMEDIAART_QUEUE_H__ +#ifndef __LIBMEDIAART_CACHE_H__ +#define __LIBMEDIAART_CACHE_H__ -#include <libtracker-sparql/tracker-sparql.h> +#include <glib.h> #if !defined (__LIBMEDIAART_INSIDE__) && !defined (LIBMEDIAART_COMPILATION) #error "Only <libmediaart/mediaart.h> must be included directly." @@ -28,11 +28,10 @@ G_BEGIN_DECLS -gboolean media_art_remove_by_uri (const gchar *uri, - const gchar *mime_type); -gboolean media_art_remove (const gchar *artist, - const gchar *albumvoid); +gboolean +media_art_remove (const gchar *artist, + const gchar *album); G_END_DECLS -#endif /* __LIBMEDIAART_QUEUE_H__ */ +#endif /* __LIBMEDIAART_CACHE_H__ */ diff --git a/libmediaart/mediaart.h b/libmediaart/mediaart.h index d8ade88..8610a27 100644 --- a/libmediaart/mediaart.h +++ b/libmediaart/mediaart.h @@ -24,7 +24,7 @@ #include <libmediaart/extract.h> #include <libmediaart/extractgeneric.h> -#include <libmediaart/queue.h> +#include <libmediaart/cache.h> #include <libmediaart/utils.h> #undef __LIBMEDIAART_H_INSIDE__ |