* src/itdb_device.c:

Re-organized the representation of iPod models -- instead of 1st
to 7th generation more well-known names like "iPod Nano 1G",
"iPod Nano 2G"... are used.

Added untested support for iPod Classic Artwork. Not clear which
thumbnail type is used for what.

src/itdb_track.c (itdb_track_set_thumbnails_internal):
Please note: itdb_track_set_thumbnails() needs to be thought
over to make sure all thumbnail types are added properly. Please
see note in itdb_track.c for details.

src/itdb.h: Added symbols for the new representation indicated
above: ITDB_IPOD_GENERATION_*, ITDB_IPOD_MODEL_*


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

1 files changed, 26 insertions, 2 deletions

diff --git a/src/itdb.h b/src/itdb.h
index aeae904..29edb7f 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -80,9 +80,23 @@ typedef enum {
     ITDB_IPOD_GENERATION_SECOND,
     ITDB_IPOD_GENERATION_THIRD,
     ITDB_IPOD_GENERATION_FOURTH,
+    ITDB_IPOD_GENERATION_PHOTO,
+    ITDB_IPOD_GENERATION_MOBILE,
+    ITDB_IPOD_GENERATION_MINI_1,
+    ITDB_IPOD_GENERATION_MINI_2,
+    ITDB_IPOD_GENERATION_SHUFFLE_1,
+    ITDB_IPOD_GENERATION_SHUFFLE_2,
+    ITDB_IPOD_GENERATION_SHUFFLE_3,
+    ITDB_IPOD_GENERATION_NANO_1,
+    ITDB_IPOD_GENERATION_NANO_2,
+    ITDB_IPOD_GENERATION_NANO_3,
+    ITDB_IPOD_GENERATION_VIDEO_1,
+    ITDB_IPOD_GENERATION_VIDEO_2,
+    ITDB_IPOD_GENERATION_CLASSIC_1,
+    ITDB_IPOD_GENERATION_TOUCH_1,
+    /* The following 2 are no longer in use and should be removed */
     ITDB_IPOD_GENERATION_FIFTH,
     ITDB_IPOD_GENERATION_SIXTH,
-    ITDB_IPOD_GENERATION_MOBILE
 } Itdb_IpodGeneration;
 
 typedef enum {
@@ -108,7 +122,17 @@ typedef enum {
     ITDB_IPOD_MODEL_NANO_BLUE,
     ITDB_IPOD_MODEL_NANO_GREEN,
     ITDB_IPOD_MODEL_NANO_PINK,
-    ITDB_IPOD_MODEL_IPHONE_1
+    ITDB_IPOD_MODEL_NANO_RED,
+    ITDB_IPOD_MODEL_IPHONE_1,
+    ITDB_IPOD_MODEL_SHUFFLE_SILVER,
+    ITDB_IPOD_MODEL_SHUFFLE_PINK,
+    ITDB_IPOD_MODEL_SHUFFLE_BLUE,
+    ITDB_IPOD_MODEL_SHUFFLE_GREEN,
+    ITDB_IPOD_MODEL_SHUFFLE_ORANGE,
+    ITDB_IPOD_MODEL_SHUFFLE_PURPLE,
+    ITDB_IPOD_MODEL_CLASSIC_SILVER,
+    ITDB_IPOD_MODEL_CLASSIC_BLACK,
+    ITDB_IPOD_MODEL_TOUCH_BLACK,
 } Itdb_IpodModel;
 
 struct _Itdb_IpodInfo {