diff options
author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-06-04 16:24:45 +0000 |
---|---|---|
committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-06-04 16:24:45 +0000 |
commit | 0763c0bc9556e8c97585b19aa2a3dfb2367dc736 (patch) | |
tree | 659eb107c8bbdacf0f74f3c9db68e0aa122eec6a /src/db-image-parser.c | |
parent | 6481a383b8749bc1fcbb8bdcdb0dd8b079d6006c (diff) | |
download | libgpod-0763c0bc9556e8c97585b19aa2a3dfb2367dc736.tar.gz libgpod-0763c0bc9556e8c97585b19aa2a3dfb2367dc736.tar.xz libgpod-0763c0bc9556e8c97585b19aa2a3dfb2367dc736.zip |
2006-06-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/db-artwork-parser.h
src/db-artwork-parserc (ipod_supports_cover_art): made
available G_GNUC_INTERNAL.
Added ipod_supports_photos().
* src/itdb_itunesdb.c (itdb_create_directories):
Create Photos directory.
2006-06-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/db-image-parser.c
src/itdb_artwork.c
src/itdb_device.c
src/itdb_photoalbum.c
src/itdb_track.c
src/ithumb-writer.c: Phased out private
IPOD_COVER_SMALL... enum in favor of identical public enum
"ItdbThumbType" ITDB_THUMB_COVER_SMALL...
* src/db-image-parser.c (ipod_image_new_from_mhni):
Accept all thumbnail types we know about (i.e. type != -1).
* src/db-artwork-debug.h
src/db-artwork-parser.h
src/db-image-parser.h
src/db-parse-context.h
src/glib-compat.h
src/itdb_endianness.h: Added CVS "$Id:" line, added copyright
notices where missing, added explanations to itdb_endianess.h
;-)
* src/itdb_itunesdb.c
src/itdb_track.c
src/itdb_device.c
src/itdb_device.h
Made naming consistent and suitable for export:
Itdb_IpodModel -> Itdb_IpodInfo
ipod_model_table -> ipod_info_table
itdb_device_get_model_info() -> itdb_device_get_ipod_info()
MODEL_TYPE_... -> ITDB_IPOD_MODEL_...
nth_GENERATION -> ITDB_IPOD_GENERATION_nth
Exported Itdb_IpodModel, Itdb_IpodGeneration, Itdb_IpodInfo,
itdb_device_get_ipod_info().
* src/itdb_device.c: new API:
itdb_info_get_ipod_info_table(),
itdb_info_get_ipod_model_name()
* src/itdb.h
src/itdb_artwork.c:
Removed unused field ->type in Itdb_Artwork and corresponding
enum ItdbArtworkType.
2006-06-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/itdb_artwork.c (itdb_thumb_get_gdk_pixbuf): handle thumbnail
padding correctly -- who would have thought that iTunes
indicates _negative_ padding at times... Please use the
test-photos program to check out whether or not your photos show
up correctly without black bars or funny colors.
* src/db-artwork-writer.c
src/db-image-parser.c
src/itdb.h
src/ithumb-writer.c: Hopefully do padding right:
- read padding fields from mhni header and store them with
each thumbnail
- calculate padding for PhotoDB only (padding for iTunesDB
Artwork does not seem to be necessary)
- include the padding into the total width/height
It seems to work well on my iPod Nano -- feedback appreciated.
* tests/test-photos.c: added possibility to dump all photos into
a directory:
tests/test-photos dump <mountpoint> <output_dir>
* src/itdb_artwork.c: changed byte order for full screen iPod
Nanos.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1299 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src/db-image-parser.c')
-rw-r--r-- | src/db-image-parser.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/db-image-parser.c b/src/db-image-parser.c index e845b92..9130bdc 100644 --- a/src/db-image-parser.c +++ b/src/db-image-parser.c @@ -62,7 +62,8 @@ image_type_from_corr_id (Itdb_Device *device, gint16 corr_id) G_GNUC_INTERNAL const Itdb_ArtworkFormat * -itdb_get_artwork_info_from_type (Itdb_Device *device, int image_type) +itdb_get_artwork_info_from_type (Itdb_Device *device, + ItdbThumbType image_type) { const Itdb_ArtworkFormat *formats; @@ -112,18 +113,13 @@ ipod_image_new_from_mhni (MhniHeader *mhni, Itdb_DB *db) corr_id = get_gint32_db (db, mhni->correlation_id); img->type = image_type_from_corr_id (device, corr_id); - if ( img->type != IPOD_COVER_SMALL - && img->type != IPOD_COVER_LARGE - && img->type != IPOD_PHOTO_SMALL - && img->type != IPOD_PHOTO_LARGE - && img->type != IPOD_PHOTO_FULL_SCREEN - && img->type != IPOD_PHOTO_TV_SCREEN) + if (img->type == -1) { - g_warning ("Unexpected cover type in mhni: type %d, size: %ux%u (%d), offset: %d\n", - img->type, img->width, img->height, - corr_id, img->offset); - g_free (img); - return NULL; + g_warning (_("Unexpected image type in mhni: size: %ux%u (%d), offset: %d\n"), + img->width, img->height, + corr_id, img->offset); + g_free (img); + return NULL; } return img; |