From 733d04ba10bb2ad4f89de543f990c0e7b7f62d99 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 9 Jun 2008 07:51:27 +0000 Subject: * src/db-artwork-writer.c: * src/itdb_artwork.c: * src/itdb_thumb.c: * src/itdb_thumb.h: fix compilation when gdk-pixbuf isn't present git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2007 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- ChangeLog | 7 +++++++ src/db-artwork-writer.c | 1 + src/itdb_artwork.c | 3 ++- src/itdb_thumb.c | 22 +++++++++++++++++++--- src/itdb_thumb.h | 5 ++--- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0789ab0..147dd16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-09 Christophe Fergeau + + * src/db-artwork-writer.c: + * src/itdb_artwork.c: + * src/itdb_thumb.c: + * src/itdb_thumb.h: fix compilation when gdk-pixbuf isn't present + 2008-06-02 Jorg Schuler * src/itdb_track.c (itdb_track_remove_thumbnails): set mhii_link diff --git a/src/db-artwork-writer.c b/src/db-artwork-writer.c index cbf22fc..0794c16 100644 --- a/src/db-artwork-writer.c +++ b/src/db-artwork-writer.c @@ -28,6 +28,7 @@ #include "db-artwork-parser.h" #if HAVE_GDKPIXBUF +#include #include "db-artwork-debug.h" #include "db-itunes-parser.h" diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c index 7891775..390841f 100644 --- a/src/itdb_artwork.c +++ b/src/itdb_artwork.c @@ -878,7 +878,8 @@ gpointer itdb_thumb_ipod_item_to_pixbuf (Itdb_Device *device, return pixbuf; } #else -gpointer itdb_thumb_ipod_item_to_pixbuf (Itdb_Thumb_Ipod_Item *item) +gpointer itdb_thumb_ipod_item_to_pixbuf (Itdb_Device *device, + Itdb_Thumb_Ipod_Item *item) { return NULL; } diff --git a/src/itdb_thumb.c b/src/itdb_thumb.c index d5f1886..37008b2 100644 --- a/src/itdb_thumb.c +++ b/src/itdb_thumb.c @@ -31,6 +31,10 @@ #include "itdb_private.h" #include "itdb_thumb.h" +#ifdef HAVE_GDKPIXBUF +#include +#endif + Itdb_Thumb *itdb_thumb_new_from_file (const gchar *filename) { Itdb_Thumb_File *thumb_file; @@ -60,7 +64,8 @@ Itdb_Thumb *itdb_thumb_new_from_data (const guchar *data, gsize len) } -Itdb_Thumb *itdb_thumb_new_from_pixbuf (GdkPixbuf *pixbuf) +#ifdef HAVE_GDKPIXBUF +Itdb_Thumb *itdb_thumb_new_from_pixbuf (gpointer pixbuf) { Itdb_Thumb_Pixbuf *thumb_pixbuf; Itdb_Thumb *thumb; @@ -72,7 +77,12 @@ Itdb_Thumb *itdb_thumb_new_from_pixbuf (GdkPixbuf *pixbuf) return thumb; } - +#else +Itdb_Thumb *itdb_thumb_new_from_pixbuf (gpointer pixbuf) +{ + return NULL; +} +#endif Itdb_Thumb_Ipod_Item *itdb_thumb_new_item_from_ipod (const Itdb_ArtworkFormat *format) { @@ -128,6 +138,9 @@ void itdb_thumb_free (Itdb_Thumb *thumb) } break; } +#else + case ITDB_THUMB_TYPE_PIXBUF: + g_assert_not_reached(); #endif case ITDB_THUMB_TYPE_IPOD: { Itdb_Thumb_Ipod *thumb_ipod = (Itdb_Thumb_Ipod *)thumb; @@ -190,6 +203,9 @@ Itdb_Thumb *itdb_thumb_duplicate (Itdb_Thumb *thumb) Itdb_Thumb_Pixbuf *thumb_pixbuf = (Itdb_Thumb_Pixbuf *)thumb; return itdb_thumb_new_from_pixbuf (thumb_pixbuf->pixbuf); } +#else + case ITDB_THUMB_TYPE_PIXBUF: + return NULL; #endif case ITDB_THUMB_TYPE_IPOD: { Itdb_Thumb_Ipod *thumb_ipod = (Itdb_Thumb_Ipod *)thumb; @@ -445,7 +461,7 @@ GList *itdb_thumb_ipod_to_pixbufs (Itdb_Device *dev, Itdb_Thumb_Ipod *thumb) return pixbufs; } #else -gpointer itdb_thumb_to_pixbuf_at_size (Itdb_Thumb *thumb, +gpointer itdb_thumb_to_pixbuf_at_size (Itdb_Device *dev, Itdb_Thumb *thumb, gint width, gint height) { return NULL; diff --git a/src/itdb_thumb.h b/src/itdb_thumb.h index 7d8d305..940128a 100644 --- a/src/itdb_thumb.h +++ b/src/itdb_thumb.h @@ -23,7 +23,6 @@ #ifndef __ITDB_THUMB_H__ #define __ITDB_THUMB_H__ -#include #include "itdb.h" #include "itdb_device.h" @@ -69,7 +68,7 @@ typedef struct _Itdb_Thumb_Memory Itdb_Thumb_Memory; struct _Itdb_Thumb_Pixbuf { struct _Itdb_Thumb parent; - GdkPixbuf *pixbuf; + gpointer pixbuf; }; typedef struct _Itdb_Thumb_Pixbuf Itdb_Thumb_Pixbuf; @@ -94,7 +93,7 @@ typedef struct _Itdb_Thumb_Ipod_Item Itdb_Thumb_Ipod_Item; G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_new_from_file (const gchar *filename); G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_new_from_data (const guchar *data, gsize len); -G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_new_from_pixbuf (GdkPixbuf *pixbuf); +G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_new_from_pixbuf (gpointer pixbuf); G_GNUC_INTERNAL Itdb_Thumb_Ipod_Item *itdb_thumb_new_item_from_ipod (const Itdb_ArtworkFormat *format); G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_ipod_new (void); G_GNUC_INTERNAL void itdb_thumb_set_rotation (Itdb_Thumb *thumb, -- cgit