diff options
| author | Christophe Fergeau <teuf@gnome.org> | 2008-05-25 10:46:13 +0000 |
|---|---|---|
| committer | Christophe Fergeau <teuf@gnome.org> | 2008-05-25 10:46:13 +0000 |
| commit | 1166a8f0d362dfcf763ddb0091b39affae269104 (patch) | |
| tree | e9aaaac7c5062b995b7712729489340bb9f60cf7 /src/db-image-parser.c | |
| parent | 38ea0e03d9414b955cd51f09a8e668c63f8899f9 (diff) | |
| download | libgpod-1166a8f0d362dfcf763ddb0091b39affae269104.tar.gz libgpod-1166a8f0d362dfcf763ddb0091b39affae269104.tar.xz libgpod-1166a8f0d362dfcf763ddb0091b39affae269104.zip | |
* src/db-artwork-debug.c:
* src/db-artwork-writer.c:
* src/db-image-parser.c:
* src/db-itunes-parser.h:
* src/itdb_device.h:
* src/ithumb-writer.c: rename correlation_id to format_id (this is
how that value is called in SysInfoExtended)
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1981 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src/db-image-parser.c')
| -rw-r--r-- | src/db-image-parser.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/db-image-parser.c b/src/db-image-parser.c index be28838..dfc7d5d 100644 --- a/src/db-image-parser.c +++ b/src/db-image-parser.c @@ -36,7 +36,7 @@ #include <glib/gi18n-lib.h> static int -image_type_from_corr_id (Itdb_Device *device, gint16 corr_id) +image_type_from_format_id (Itdb_Device *device, gint16 format_id) { const Itdb_ArtworkFormat *formats; @@ -51,7 +51,7 @@ image_type_from_corr_id (Itdb_Device *device, gint16 corr_id) } while (formats->type != -1) { - if (formats->correlation_id == corr_id) { + if (formats->format_id == format_id) { return formats->type; } formats++; @@ -91,7 +91,7 @@ G_GNUC_INTERNAL Itdb_Thumb * ipod_image_new_from_mhni (MhniHeader *mhni, Itdb_DB *db) { Itdb_Thumb *img; - gint16 corr_id; + gint16 format_id; Itdb_Device *device = NULL; img = g_new0 (Itdb_Thumb, 1); @@ -110,19 +110,19 @@ ipod_image_new_from_mhni (MhniHeader *mhni, Itdb_DB *db) device = db_get_device (db); g_return_val_if_fail (device, NULL); - corr_id = get_gint32_db (db, mhni->correlation_id); - img->type = image_type_from_corr_id (device, corr_id); + format_id = get_gint32_db (db, mhni->format_id); + img->type = image_type_from_format_id (device, format_id); #if DEBUG_ARTWORK - printf ("corr_id: %d, of: %6d sz: %6d, x: %3d, y: %3d, xpad: %3d, ypad: %3d\n", - corr_id, img->offset, img->size, img->width, img->height, img->horizontal_padding, img->vertical_padding); + printf ("format_id: %d, of: %6d sz: %6d, x: %3d, y: %3d, xpad: %3d, ypad: %3d\n", + format_id, img->offset, img->size, img->width, img->height, img->horizontal_padding, img->vertical_padding); #endif if (img->type == -1) { g_warning (_("Unexpected image type in mhni: size: %ux%u (%d), offset: %d\n"), img->width, img->height, - corr_id, img->offset); + format_id, img->offset); g_free (img); return NULL; } |