* src/Makefile.am:

* src/db-artwork-parser.c:
* src/db-artwork-writer.c:
* src/db-image-parser.c:
* src/db-image-parser.h:
* src/itdb.h:
* src/itdb_artwork.c:
* src/itdb_device.h:
* src/itdb_photoalbum.c:
* src/itdb_track.c:
* src/ithumb-writer.c:
* tests/test-covers.c:
* tests/test-photos.c: rework Itdb_Thumb type. Now it's split into
different subtypes depending on what it represents (GdkPixbuf,
thumbnail read from the ipod, ...). Itdb_Artwork now contains only a
pointer to a single Itdb_Thumb (it used to contain a GList * of
Itdb_Thumb) since the only time when the list is useful is for thumbs
read from the ipod. Using a list for the other types of thumbnails
created some complications when trying to set art on an Itdb_Track that
wasn't attached to an Itdb_iTunesDB.


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

1 files changed, 4 insertions, 7 deletions

diff --git a/src/db-image-parser.h b/src/db-image-parser.h
index a9a3862..c8fbbe4 100644
--- a/src/db-image-parser.h
+++ b/src/db-image-parser.h
@@ -29,6 +29,7 @@
 #include "db-itunes-parser.h"
 #include "itdb_device.h"
 #include "itdb_private.h"
+#include "itdb_thumb.h"
 #include "itdb.h"
 
 #define DEBUG_ARTWORK 0
@@ -77,16 +78,12 @@
 #define BLUE_SHIFT_888 0
 #define BLUE_MASK_888 (((1 << BLUE_BITS_888)-1) << BLUE_SHIFT_888)
 
-G_GNUC_INTERNAL Itdb_Thumb *ipod_image_new_from_mhni (MhniHeader *mhni, 
-						      Itdb_DB *db);
+G_GNUC_INTERNAL Itdb_Thumb_Ipod_Item *ipod_image_new_from_mhni (MhniHeader *mhni, 
+			        			   Itdb_DB *db);
 
 G_GNUC_INTERNAL int itdb_write_ithumb_files (Itdb_DB *db);
 
 G_GNUC_INTERNAL gboolean
-itdb_thumb_type_is_valid_for_db (const ItdbThumbType thumb_type, DbType db_type);
-
-G_GNUC_INTERNAL
-const Itdb_ArtworkFormat *itdb_get_artwork_info_from_type (
-    Itdb_Device *ipod, ItdbThumbType image_type);
+itdb_thumb_type_is_valid_for_db (const Itdb_ArtworkFormat *format, DbType db_type);
 
 #endif