* src/itdb_device.c:

* src/itdb_device.h:
* src/itdb_sysinfo_extended_parser.c:
* src/itdb_sysinfo_extended_parser.h: merge Itdb_ArtworkFormat and
SysInfoImageFormat, use artwork formats from SysInfoExtended when
it's available instead of using the hardcoded tables from libgpod


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

1 files changed, 17 insertions, 10 deletions

diff --git a/src/itdb_device.h b/src/itdb_device.h
index 2d733a4..4152f28 100644
--- a/src/itdb_device.h
+++ b/src/itdb_device.h
@@ -94,16 +94,23 @@ struct _Itdb_Device
 
 };
 
-struct _Itdb_ArtworkFormat
-{
-	gint16 width;
-	gint16 height;
-	gint16 format_id;
-        ItdbThumbFormat format;
-        gint32 padding;
-        /* If true, crop the artwork to completely fill the target size,
-          rather than leaving empty bars on the top or sides. */
-        gboolean crop;
+struct _Itdb_ArtworkFormat {
+        gint16 format_id; 
+        gint16 width; 
+        gint16 height; 
+        ItdbThumbFormat format; 
+        gint32 padding; /* not found in SysInfoExtended, added  
+                         * for compatibility with hardcoded artwork formats */ 
+        gboolean crop; 
+        gint rotation; 
+        guint back_color; 
+ 
+        gint display_width; 
+        gboolean interlaced; 
+        gboolean align_row_bytes; 
+        gint color_adjustment; 
+        gdouble gamma;
+        gint associated_format;
 };
 
 G_GNUC_INTERNAL GList *itdb_device_get_photo_formats (const Itdb_Device *device);