diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2005-12-04 07:01:27 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2005-12-04 07:01:27 +0000 |
| commit | 71fd00dbd582621cc7b4f5c90a33f90ac77e835d (patch) | |
| tree | 7cf080c719cfd11a02b5b722d766f654813fd768 /src/db-artwork-parser.c | |
| parent | fbb4c8342388449e4efbab4506cc6c96bd3be6f9 (diff) | |
| download | libgpod-71fd00dbd582621cc7b4f5c90a33f90ac77e835d.tar.gz libgpod-71fd00dbd582621cc7b4f5c90a33f90ac77e835d.tar.xz libgpod-71fd00dbd582621cc7b4f5c90a33f90ac77e835d.zip | |
* 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
Diffstat (limited to 'src/db-artwork-parser.c')
| -rw-r--r-- | src/db-artwork-parser.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 <glib/gi18n-lib.h> 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; |