commit 858dd5fd5cbd0c4df5789b74e1bcea5d6d606566
Author: Christophe Fergeau <[email protected]>
Date: Sat Oct 10 15:40:22 2009 +0200
add data about new iPod Touch models
The serial number for the 32GB iPod touch is missing
src/itdb.h | 6 ++++--
src/itdb_device.c | 25 ++++++++++++++++++++++---
tools/hal-callout.c | 4 ++++
3 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/src/itdb.h b/src/itdb.h
index 24b40c0..b7304ed 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -118,8 +118,9 @@ typedef struct _Itdb_Chapterdata Itdb_Chapterdata;
* @ITDB_IPOD_GENERATION_CLASSIC_2: Second Generation iPod Classic
* @ITDB_IPOD_GENERATION_CLASSIC_3: Third Generation iPod Classic
* @ITDB_IPOD_GENERATION_TOUCH_1: First Generation iPod Touch
- * @ITDB_IPOD_GENERATION_IPHONE_1: First Generation iPhone
* @ITDB_IPOD_GENERATION_TOUCH_2: Second Generation iPod Touch
+ * @ITDB_IPOD_GENERATION_TOUCH_3: Third Generation iPod Touch
+ * @ITDB_IPOD_GENERATION_IPHONE_1: First Generation iPhone
* @ITDB_IPOD_GENERATION_IPHONE_2: Second Generation iPhone (aka iPhone 3G)
* @ITDB_IPOD_GENERATION_IPHONE_3: Third Generation iPhone (aka iPhone 3GS)
*
@@ -158,7 +159,8 @@ typedef enum {
ITDB_IPOD_GENERATION_IPHONE_2,
ITDB_IPOD_GENERATION_IPHONE_3,
ITDB_IPOD_GENERATION_CLASSIC_3,
- ITDB_IPOD_GENERATION_NANO_5
+ ITDB_IPOD_GENERATION_NANO_5,
+ ITDB_IPOD_GENERATION_TOUCH_3
} Itdb_IpodGeneration;
/**
diff --git a/src/itdb_device.c b/src/itdb_device.c
index 5087566..a12c5d6 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -263,6 +263,14 @@ static const Itdb_IpodInfo ipod_info_table [] = {
{"A623", 8, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_1, 50},
{"A627", 16, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_1, 50},
+ /* iPod Touch 3rd gen */
+ /* The 8GB model is marked as 2nd gen because it's actually what the
+ * hardware is even if Apple markets it the same as the 2 bigger models
+ */
+ {"C086", 8, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_2, 50},
+ {"C008", 32, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_3, 50},
+ {"C011", 64, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_3, 50},
+
/* iPhone, iPhone 3G and iPhone 3GS */
{"A501", 4, ITDB_IPOD_MODEL_IPHONE_1,
ITDB_IPOD_GENERATION_IPHONE_1, 50},
{"A712", 8, ITDB_IPOD_MODEL_IPHONE_1,
ITDB_IPOD_GENERATION_IPHONE_1, 50},
@@ -361,6 +369,7 @@ static const gchar *ipod_generation_name_table [] = {
N_("iPhone 3GS"),
N_("Classic"),
N_("Nano with camera (5th Gen.)"),
+ N_("Touch (3rd Gen.)"),
N_("Unused"),
N_("Unused"),
NULL
@@ -521,6 +530,7 @@ static const ArtworkCapabilities
ipod_artwork_capabilities[] = {
{ ITDB_IPOD_GENERATION_CLASSIC_3, ipod_classic_1_cover_art_info,
ipod_classic_1_photo_info, ipod_classic_1_chapter_image_info },
{ ITDB_IPOD_GENERATION_TOUCH_1, ipod_touch_1_cover_art_info,
ipod_touch_1_photo_info, NULL },
{ ITDB_IPOD_GENERATION_TOUCH_2, ipod_touch_1_cover_art_info,
ipod_touch_1_photo_info, NULL },
+ { ITDB_IPOD_GENERATION_TOUCH_3, ipod_touch_1_cover_art_info,
ipod_touch_1_photo_info, NULL },
{ ITDB_IPOD_GENERATION_IPHONE_1, ipod_touch_1_cover_art_info,
ipod_touch_1_photo_info, NULL },
{ ITDB_IPOD_GENERATION_IPHONE_2, ipod_touch_1_cover_art_info,
ipod_touch_1_photo_info, NULL },
{ ITDB_IPOD_GENERATION_IPHONE_3, ipod_touch_1_cover_art_info,
ipod_touch_1_photo_info, NULL },
@@ -725,7 +735,11 @@ static const ItdbSerialToModel serial_to_model_mapping[] =
{
{ "4NZ", "B867" }, /* 4GB Silver Shuffle 4g */
{ "891", "C164" }, /* 4GB Black Shuffle 4g */
+
{ "W4T", "A627" }, /* 16GB Silver iPod Touch */
+ { "7SJ", "C086" }, /* 8GB Silver iPod Touch (3rd gen) */
+ { "6K4", "C011" }, /* 64GB Silver iPod Touch (3rd gen) */
+
{ "WH8", "A712" }, /* 8GB Silver iPhone */
{ "0KH", "B384" }, /* 16GB Silver iPhone */
{ "Y7K", "B496" }, /* 16GB Black iPhone 3G */
@@ -1240,6 +1254,7 @@ itdb_device_supports_compressed_itunesdb (const
Itdb_Device *device)
case ITDB_IPOD_GENERATION_CLASSIC_3:
return FALSE;
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
return TRUE;
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_IPHONE_1:
@@ -1293,8 +1308,9 @@ itdb_device_supports_sparse_artwork (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_CLASSIC_2:
case ITDB_IPOD_GENERATION_CLASSIC_3:
case ITDB_IPOD_GENERATION_TOUCH_1:
- case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
supports_sparse_artwork = TRUE;
@@ -1600,8 +1616,9 @@ gboolean itdb_device_supports_video (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_CLASSIC_2:
case ITDB_IPOD_GENERATION_CLASSIC_3:
case ITDB_IPOD_GENERATION_TOUCH_1:
- case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
return TRUE;
@@ -1708,6 +1725,7 @@ static ItdbChecksumType itdb_device_get_checksum_type
(const Itdb_Device *device
case ITDB_IPOD_GENERATION_NANO_5:
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -1994,8 +2012,9 @@ itdb_device_supports_podcast (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_CLASSIC_2:
case ITDB_IPOD_GENERATION_CLASSIC_3:
case ITDB_IPOD_GENERATION_TOUCH_1:
- case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
return TRUE;
diff --git a/tools/hal-callout.c b/tools/hal-callout.c
index 3771d48..1128fa9 100644
--- a/tools/hal-callout.c
+++ b/tools/hal-callout.c
@@ -192,6 +192,7 @@ get_model_name (const Itdb_IpodInfo *info)
return g_strdup ("classic");
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
return g_strdup ("touch");
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
@@ -258,6 +259,8 @@ get_generation (const Itdb_IpodInfo *info)
return 1.0;
case ITDB_IPOD_GENERATION_TOUCH_2:
return 2.0;
+ case ITDB_IPOD_GENERATION_TOUCH_3:
+ return 3.0;
case ITDB_IPOD_GENERATION_IPHONE_1:
return 1.0;
case ITDB_IPOD_GENERATION_IPHONE_2:
@@ -446,6 +449,7 @@ get_icon_name (const Itdb_IpodInfo *info)
case ITDB_IPOD_GENERATION_TOUCH_1:
return g_strdup ("multimedia-player-apple-ipod-touch");
case ITDB_IPOD_GENERATION_TOUCH_2:
+ case ITDB_IPOD_GENERATION_TOUCH_3:
return g_strdup ("multimedia-player-apple-ipod-touch-2g");
case ITDB_IPOD_GENERATION_IPHONE_1:
return g_strdup ("phone-apple-iphone");
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
