* src/itdb_track.c (itdb_track_set_thumbnails_internal): set

artwork ID to 0 after removing thumbnails.

* src/db-artwork-parser.c (parse_mhii): move out dbid association
to a separate function.

(mhfd_associate_itunesdb_artwork): handle dbid and mhii_link
association of artwork to track

(parse_mhfd): loop over the number of mhsd hunks instead of
hardcoding it. Call mhfd_associate_itunesdb_artwork().

* src/itdb_itunesdb.c (get_mhit): read the mhii_link field.

* src/db-artwork-writer.c (write_mhli): handle unset artwork
correctly.

(itdb_track_filter_thumbnails): remove thumbnails correctly.

* src/db-parse-context.c (db_parse_context_get_sub_context): copy
newly introduced artwork field.

* tests/test-covers.c: print mhii_link.

* src/itdb.h: (Itdb_Track) added mhii_link. (Itdb_Artwork): added
dbid.

* src/itdb.h, src/db-artwork-parser.c, src/db-artwork-writer.c,
src/itdb_device.c, src/ithumb-writer.c, src/itdb_artwork.c:
added ITDB_THUMB_CHAPTER_SMALL/LARGE.

* src/itdb_device.c: ipod_classic_1_artwork_info: correct
ITDB_THUMB_COVER_SMALL/LARGE entries.


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

1 files changed, 7 insertions, 0 deletions

diff --git a/src/itdb.h b/src/itdb.h
index 92c5eb1..90dd5d4 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -490,6 +490,8 @@ typedef enum {
     ITDB_THUMB_COVER_MEDIUM,      /* iPhone: cover view */
     ITDB_THUMB_COVER_SMEDIUM,     /* iPhone: ??         */
     ITDB_THUMB_COVER_XSMALL,      /* iPhone: ??         */
+    ITDB_THUMB_CHAPTER_SMALL,     /* classic -- not supported yet */
+    ITDB_THUMB_CHAPTER_LARGE,     /* classic -- not supported yet */
 } ItdbThumbType;
 
 
@@ -539,6 +541,8 @@ struct _Itdb_Artwork {
     GList *thumbnails;     /* list of Itdb_Thumbs */
     guint32 id;            /* Artwork id used by photoalbums, starts at
 			    * 0x40... libgpod will set this on sync. */
+    guint64 dbid;          /* dbid of associated track. used
+			      internally by libgpod */
     gint32  unk028;
     guint32 rating;        /* Rating from iPhoto * 20 (PhotoDB only) */
     gint32  unk036;
@@ -995,6 +999,9 @@ struct _Itdb_Track
   /* This is for Cover Art support */
   struct _Itdb_Artwork *artwork;
 
+    /* 200805 */
+  guint32 mhii_link;
+
   /* reserved for future use */
   gint32 reserved_int1;
   gint32 reserved_int2;