Revision: 2007
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2007&view=rev
Author: teuf
Date: 2008-06-09 00:51:27 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
* 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
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/db-artwork-writer.c
libgpod/trunk/src/itdb_artwork.c
libgpod/trunk/src/itdb_thumb.c
libgpod/trunk/src/itdb_thumb.h
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-06-05 12:14:27 UTC (rev 2006)
+++ libgpod/trunk/ChangeLog 2008-06-09 07:51:27 UTC (rev 2007)
@@ -1,3 +1,10 @@
+2008-06-09 Christophe Fergeau <[EMAIL PROTECTED]>
+
+ * 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 <jcsjcs at users.sourceforge.net>
* src/itdb_track.c (itdb_track_remove_thumbnails): set mhii_link
Modified: libgpod/trunk/src/db-artwork-writer.c
===================================================================
--- libgpod/trunk/src/db-artwork-writer.c 2008-06-05 12:14:27 UTC (rev
2006)
+++ libgpod/trunk/src/db-artwork-writer.c 2008-06-09 07:51:27 UTC (rev
2007)
@@ -28,6 +28,7 @@
#include "db-artwork-parser.h"
#if HAVE_GDKPIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "db-artwork-debug.h"
#include "db-itunes-parser.h"
Modified: libgpod/trunk/src/itdb_artwork.c
===================================================================
--- libgpod/trunk/src/itdb_artwork.c 2008-06-05 12:14:27 UTC (rev 2006)
+++ libgpod/trunk/src/itdb_artwork.c 2008-06-09 07:51:27 UTC (rev 2007)
@@ -878,7 +878,8 @@
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;
}
Modified: libgpod/trunk/src/itdb_thumb.c
===================================================================
--- libgpod/trunk/src/itdb_thumb.c 2008-06-05 12:14:27 UTC (rev 2006)
+++ libgpod/trunk/src/itdb_thumb.c 2008-06-09 07:51:27 UTC (rev 2007)
@@ -31,6 +31,10 @@
#include "itdb_private.h"
#include "itdb_thumb.h"
+#ifdef HAVE_GDKPIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#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_pixbuf (GdkPixbuf *pixbuf)
+#ifdef HAVE_GDKPIXBUF
+Itdb_Thumb *itdb_thumb_new_from_pixbuf (gpointer pixbuf)
{
Itdb_Thumb_Pixbuf *thumb_pixbuf;
Itdb_Thumb *thumb;
@@ -72,8 +77,13 @@
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)
{
Itdb_Thumb_Ipod_Item *thumb_ipod;
@@ -128,6 +138,9 @@
}
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_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 @@
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;
Modified: libgpod/trunk/src/itdb_thumb.h
===================================================================
--- libgpod/trunk/src/itdb_thumb.h 2008-06-05 12:14:27 UTC (rev 2006)
+++ libgpod/trunk/src/itdb_thumb.h 2008-06-09 07:51:27 UTC (rev 2007)
@@ -23,7 +23,6 @@
#ifndef __ITDB_THUMB_H__
#define __ITDB_THUMB_H__
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include "itdb.h"
#include "itdb_device.h"
@@ -69,7 +68,7 @@
struct _Itdb_Thumb_Pixbuf {
struct _Itdb_Thumb parent;
- GdkPixbuf *pixbuf;
+ gpointer pixbuf;
};
typedef struct _Itdb_Thumb_Pixbuf Itdb_Thumb_Pixbuf;
@@ -94,7 +93,7 @@
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,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
