Fix build of python bindings with new thumbnail API

This just fixes the build.  More work needs to be done to properly
adapt the bindings to the new API and make it usable from python.

3 files changed, 27 insertions, 26 deletions

diff --git a/bindings/python/gpod.i.in b/bindings/python/gpod.i.in
index e74d3d9..9960002 100644
--- a/bindings/python/gpod.i.in
+++ b/bindings/python/gpod.i.in
@@ -56,6 +56,7 @@ version = '.'.join(map(str, version_info))
 #include "itdb.h" 
 #include "itdb_device.h" 
 #include "itdb_private.h"
+#include "itdb_thumb.h"
 #include <time.h>
 #include <datetime.h>
 #ifdef HAVE_GDKPIXBUF
@@ -82,7 +83,7 @@ PyObject* sw_get_photoalbums(Itdb_PhotoDB *db);
 PyObject* sw_get_photoalbum(GList *list, gint index);
 PyObject* sw_get_photos(Itdb_PhotoDB *db);
 PyObject* sw_get_photo(GList *list, gint index);
-PyObject* sw_get_artwork_thumbnails(Itdb_Artwork *artwork);
+PyObject* sw_get_artwork_thumbnails(Itdb_PhotoDB *db, Itdb_Artwork *artwork);
 PyObject* sw_get_photoalbum_members(Itdb_PhotoAlbum *album);
 PyObject* sw_ipod_device_to_dict(Itdb_Device *device);
 void sw__track_extra_destroy (PyObject *data);
@@ -208,12 +209,15 @@ SWIGTYPE_p__Itdb_PhotoAlbum, 0));
   return list;
  }
 
- PyObject* sw_get_artwork_thumbnails(Itdb_Artwork *artwork) {
+ PyObject* sw_get_artwork_thumbnails(Itdb_PhotoDB *db, Itdb_Artwork *artwork) {
   PyObject    *list;
   gint        i;
-  GList       *l;
-  list = PyList_New(g_list_length(artwork->thumbnails));
-  for (l = artwork->thumbnails, i = 0; l; l = l->next, ++i) {
+  GList       *l, *thumbnails;
+  Itdb_Thumb_Ipod *thumb;
+  thumb = (Itdb_Thumb_Ipod *)artwork->thumbnail;
+  thumbnails = itdb_thumb_ipod_to_pixbufs (db->device, thumb);
+  list = PyList_New(g_list_length(thumbnails));
+  for (l = thumbnails, i = 0; l; l = l->next, ++i) {
     PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p__Itdb_Thumb, 0));
   }
   return list;
@@ -487,9 +491,10 @@ typedef int gint;
 
 #ifdef HAVE_GDKPIXBUF
 #ifdef HAVE_PYGOBJECT
-%typemap(out) gpointer itdb_thumb_get_gdk_pixbuf {
+%typemap(out) gpointer itdb_artwork_get_pixbuf {
   $result = pygobject_new((GObject *)$1);
-  g_object_unref($1);
+  if ($1)
+    g_object_unref($1);
 }
 
 %typemap(in) gpointer pixbuf {
@@ -515,7 +520,7 @@ PyObject* sw_get_photoalbum(GList *list, gint index);
 PyObject* sw_get_photos(Itdb_PhotoDB *db);
 PyObject* sw_get_photo(GList *list, gint index);
 PyObject* sw_get_photoalbum_members(Itdb_PhotoAlbum *album);
-PyObject* sw_get_artwork_thumbnails(Itdb_Artwork *artwork);
+PyObject* sw_get_artwork_thumbnails(Itdb_PhotoDB *db, Itdb_Artwork *artwork);
 PyObject* sw_ipod_device_to_dict(Itdb_Device *device);
 
 %include "@top_srcdir@/src/itdb.h"
diff --git a/bindings/python/ipod.py b/bindings/python/ipod.py
index 053eda6..29a4a9a 100644
--- a/bindings/python/ipod.py
+++ b/bindings/python/ipod.py
@@ -965,16 +965,19 @@ class Photo:
             raise KeyError('No such key: %s' % item)
 
     def get_thumbnails(self):
+        db = self._database
+        if hasattr(self._database, '_itdb'):
+            db = self._database._itdb
         return [Thumbnail(proxied_thumbnail=t,
                           ownerobject=self) for t in gpod.sw_get_artwork_thumbnails(
-            self._photo)]
+            db, self._photo)]
 
     thumbnails = property(get_thumbnails)
 
 class Thumbnail:
     """A thumbnail in an Photo."""
 
-    _proxied_attributes = [k for k in gpod._Itdb_Thumb.__dict__.keys()
+    _proxied_attributes = [k for k in gpod._Itdb_Artwork.__dict__.keys()
                             if not (k.startswith("_") or k.startswith("reserved"))]
 
     def __init__(self, proxied_thumbnail=None, ownerobject=None):
@@ -1022,11 +1025,7 @@ class Thumbnail:
     if pixbuf_support:
         def get_pixbuf(self):
             # this deals with coverart and photo albums
+            device = self.__ownerobject._database.device
             if hasattr(self.__ownerobject._database,"_itdb"):
-                return gpod.itdb_thumb_get_gdk_pixbuf(
-                    self.__ownerobject._database._itdb.device,
-                    self._thumbnail)
-            else:
-                return gpod.itdb_thumb_get_gdk_pixbuf(
-                    self.__ownerobject._database.device,
-                    self._thumbnail)
+                device = self.__ownerobject._database._itdb.device
+            return gpod.itdb_artwork_get_pixbuf(device, self._thumbnail)
diff --git a/src/itdb.h b/src/itdb.h
index 65096fa..6201006 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -1184,11 +1184,10 @@ void itdb_photodb_photoalbum_remove (Itdb_PhotoDB *db,
 Itdb_PhotoAlbum *itdb_photodb_photoalbum_by_name(Itdb_PhotoDB *db,
 						 const gchar *albumname );
 
-/* itdb_artwork_... -- you probably won't need many of these (probably
- * with the exception of itdb_artwork_get_thumb_by_type() and
- * itdb_thumb_get_gdk_pixbuf() probably). Use the itdb_photodb_...()
- * functions when adding photos, and the itdb_track_...() functions
- * when adding coverart to audio. */
+/* itdb_artwork_... -- you probably won't need many of these (with
+ * the exception of itdb_artwork_get_pixbuf() probably). Use the
+ * itdb_photodb_...() functions when adding photos, and the
+ * itdb_track_...() functions when adding coverart to audio. */
 Itdb_Artwork *itdb_artwork_new (void);
 Itdb_Artwork *itdb_artwork_duplicate (Itdb_Artwork *artwork);
 void itdb_artwork_free (Itdb_Artwork *artwork);
@@ -1204,14 +1203,12 @@ gboolean itdb_artwork_set_thumbnail_from_pixbuf (Itdb_Artwork *artwork,
                                                  gint rotation,
                                                  GError **error);
 void itdb_artwork_remove_thumbnails (Itdb_Artwork *artwork);
+/* the following function returns a pointer to a GdkPixbuf if
+   gdk-pixbuf is installed -- a NULL pointer otherwise. */
 gpointer itdb_artwork_get_pixbuf (Itdb_Device *device, Itdb_Artwork *artwork, 
                                   gint width, gint height);
 
 /* itdb_thumb_... */
-/* the following function returns a pointer to a GdkPixbuf if
-   gdk-pixbuf is installed -- a NULL pointer otherwise. */
-gpointer itdb_thumb_get_gdk_pixbuf (Itdb_Device *device,
-				    Itdb_Thumb *thumb);
 Itdb_Thumb *itdb_thumb_duplicate (Itdb_Thumb *thumb);
 void itdb_thumb_free (Itdb_Thumb *thumb);