Remove references to itdb_thumb_get_gdk_pixbuf()

git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2050 f01d2545-417e-4e96-918e-98f8d0dbbcb6

8 files changed, 25 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 41ce013..2a91496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-17  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* README
+	  bindings/python/gpod.i.in
+	  bindings/python/ipod.py
+	  docs/reference/libgpod-sections.txt
+	  docs/reference/tmpl/artwork.sgml
+	  docs/reference/tmpl/itunesdb-db.sgml
+	  src/itdb.h: Remove references to itdb_thumb_get_gdk_pixbuf()
+
 2008-07-10  Christophe Fergeau <teuf@gnome.org>
 
 	* src/db-artwork-writer.c: if we fail to write ithmb files for some
diff --git a/README b/README
index b79428b..3a2ede5 100644
--- a/README
+++ b/README
@@ -48,11 +48,9 @@ A number of functions to add/remove playlists, or add/remove tracks
 are available. Please see itdb.h for details (itdb_playlist_*()).
 
 Each track can have a thumbnail associated with it. You can retrieve a
-GdkPixmap of the thumbnail using itdb_thumb_get_gdk_pixbuf() (tracks
-have thumbnails of the following types associated:
-ITDB_THUMB_COVER_SMALL and _LARGE). You can remove a thumbnail with
-itdb_track_remove_thumbnails(). And finally, you can set a new
-thumbnail using itdb_track_set_thumbnails().
+GdkPixmap of the thumbnail using itdb_artwork_get_pixbuf().  You can
+remove a thumbnail with itdb_track_remove_thumbnails(). And finally,
+you can set a new thumbnail using itdb_track_set_thumbnails().
 
 Please note that iTunes additionally stores the artwork as tags in the
 original music file. That's also from where the data is read when
diff --git a/bindings/python/gpod.i.in b/bindings/python/gpod.i.in
index e74d3d9..4ac7e20 100644
--- a/bindings/python/gpod.i.in
+++ b/bindings/python/gpod.i.in
@@ -487,7 +487,7 @@ 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);
 }
diff --git a/bindings/python/ipod.py b/bindings/python/ipod.py
index 053eda6..e5440d2 100644
--- a/bindings/python/ipod.py
+++ b/bindings/python/ipod.py
@@ -1023,10 +1023,10 @@ class Thumbnail:
         def get_pixbuf(self):
             # this deals with coverart and photo albums
             if hasattr(self.__ownerobject._database,"_itdb"):
-                return gpod.itdb_thumb_get_gdk_pixbuf(
+                return gpod.itdb_artwork_get_pixbuf(
                     self.__ownerobject._database._itdb.device,
                     self._thumbnail)
             else:
-                return gpod.itdb_thumb_get_gdk_pixbuf(
+                return gpod.itdb_artwork_get_pixbuf(
                     self.__ownerobject._database.device,
                     self._thumbnail)
diff --git a/docs/reference/libgpod-sections.txt b/docs/reference/libgpod-sections.txt
index e7aad15..966104c 100644
--- a/docs/reference/libgpod-sections.txt
+++ b/docs/reference/libgpod-sections.txt
@@ -188,7 +188,6 @@ itdb_artwork_add_thumbnail_from_pixbuf
 itdb_artwork_remove_thumbnail
 itdb_artwork_remove_thumbnails
 itdb_artwork_get_thumb_by_type
-itdb_thumb_get_gdk_pixbuf
 itdb_thumb_duplicate
 itdb_thumb_free
 itdb_thumb_new
diff --git a/docs/reference/tmpl/artwork.sgml b/docs/reference/tmpl/artwork.sgml
index 2ae5914..e185111 100644
--- a/docs/reference/tmpl/artwork.sgml
+++ b/docs/reference/tmpl/artwork.sgml
@@ -101,16 +101,6 @@ album/track artwork.  For working with photos, see the
 @artwork: 
 
 
-<!-- ##### FUNCTION itdb_thumb_get_gdk_pixbuf ##### -->
-<para>
-
-</para>
-
-@device: 
-@thumb: 
-@Returns: 
-
-
 <!-- ##### FUNCTION itdb_thumb_duplicate ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/itunesdb-db.sgml b/docs/reference/tmpl/itunesdb-db.sgml
index b80b5b3..27d3f52 100644
--- a/docs/reference/tmpl/itunesdb-db.sgml
+++ b/docs/reference/tmpl/itunesdb-db.sgml
@@ -59,11 +59,9 @@ tracks are available. Please see
 <para>
 Each track can have a thumbnail associated with it. You can
 retrieve a GdkPixmap of the thumbnail using
-itdb_thumb_get_gdk_pixbuf() (tracks have thumbnails of the
-following types associated: @ITDB_THUMB_COVER_SMALL and
-@ITDB_THUMB_COVER_LARGE).  You can remove a thumbnail with
-itdb_track_remove_thumbnails().  And finally, you can set a
-new thumbnail using itdb_track_set_thumbnails().
+itdb_artwork_get_pixbuf().  You can remove a thumbnail with
+itdb_track_remove_thumbnails().  And finally, you can set a new
+thumbnail using itdb_track_set_thumbnails().
 </para>
 <para>
 Please note that iTunes additionally stores the artwork as tags
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);