From 84cd1377dbd2bc80a98cf16579d22b792dee4c12 Mon Sep 17 00:00:00 2001 From: jcsjcs Date: Sun, 4 Dec 2005 07:01:27 +0000 Subject: * src/db-artwork-writer.c, src/itdb_itunesdb.c, src/itdb_track.c, src/ithumb-writer.c: handle artwork size and count self-consistently. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1184 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- src/db-artwork-parser.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/db-artwork-parser.c') diff --git a/src/db-artwork-parser.c b/src/db-artwork-parser.c index 2709e42..152c245 100644 --- a/src/db-artwork-parser.c +++ b/src/db-artwork-parser.c @@ -34,6 +34,7 @@ #include "db-image-parser.h" #include "db-itunes-parser.h" #include "db-parse-context.h" +#include typedef int (*ParseListItem)(DBParseContext *ctx, Itdb_iTunesDB *db, GError *error); @@ -239,8 +240,9 @@ parse_mhii (DBParseContext *ctx, Itdb_iTunesDB *db, GError *error) return -1; } - if (song->artwork_size != GINT_FROM_LE (mhii->orig_img_size)-1) { - g_warning ("iTunesDB and ArtworkDB artwork sizes don't match (%d %d)", song->artwork_size , GINT_FROM_LE (mhii->orig_img_size)); + if ((song->artwork_size+song->artwork_count) != + GINT_FROM_LE (mhii->orig_img_size)-1) { + g_warning (_("iTunesDB and ArtworkDB artwork sizes inconsistent (%d+%d != %d)"), song->artwork_size, song->artwork_count, GINT_FROM_LE (mhii->orig_img_size)); } song->artwork->artwork_size = GINT_FROM_LE (mhii->orig_img_size)-1; @@ -376,7 +378,7 @@ parse_mhsd (DBParseContext *ctx, Itdb_iTunesDB *db, GError **error) break; } default: - g_warning ("Unexpected mhsd index: %d\n", + g_warning (_("Unexpected mhsd index: %d\n"), GINT_FROM_LE (mhsd->index)); return -1; break; -- cgit