commit 5b2d635fe1814c867fcd414d91ef872056f3dd4c
Author: Christophe Fergeau <t...@gnome.org>
Date: Sat Sep 18 18:34:04 2010 +0200
add 4th gen iPod Touch to known models
This adds the part numbers for the 8GB, 32GB and 64GB iPod Touch,
as well as the serial number for the 32GB model courtesy of Riley
Hosman.
src/itdb.h | 4 +++-
src/itdb_device.c | 20 +++++++++++++++++---
tools/generic-callout.c | 4 ++++
3 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/src/itdb.h b/src/itdb.h
index 4f6d1e8..05aee8d 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -120,6 +120,7 @@ typedef struct _Itdb_Chapterdata Itdb_Chapterdata;
* @ITDB_IPOD_GENERATION_TOUCH_1: First Generation iPod Touch
* @ITDB_IPOD_GENERATION_TOUCH_2: Second Generation iPod Touch
* @ITDB_IPOD_GENERATION_TOUCH_3: Third Generation iPod Touch
+ * @ITDB_IPOD_GENERATION_TOUCH_4: Fourth 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)
@@ -163,7 +164,8 @@ typedef enum {
ITDB_IPOD_GENERATION_NANO_5,
ITDB_IPOD_GENERATION_TOUCH_3,
ITDB_IPOD_GENERATION_IPAD_1,
- ITDB_IPOD_GENERATION_IPHONE_4
+ ITDB_IPOD_GENERATION_IPHONE_4,
+ ITDB_IPOD_GENERATION_TOUCH_4
} Itdb_IpodGeneration;
/**
diff --git a/src/itdb_device.c b/src/itdb_device.c
index a90a675..65aecb0 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -286,6 +286,11 @@ static const Itdb_IpodInfo ipod_info_table [] = {
{"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},
+ /* iPod Touch 4th gen */
+ {"C540", 8, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_4, 50},
+ {"C544", 32, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_4, 50},
+ {"C547", 64, ITDB_IPOD_MODEL_TOUCH_SILVER,
ITDB_IPOD_GENERATION_TOUCH_4, 50},
+
/* iPhone */
{"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},
@@ -808,9 +813,10 @@ static const ItdbSerialToModel serial_to_model_mapping[] =
{
{ "0JW", "B376" }, /* 32GB Silver iPod Touch (1st gen) */
{ "201", "B528" }, /* 8GB Silver iPod Touch (2nd gen) */
{ "203", "B531" }, /* 16GB Silver iPod Touch (2nd gen) */
- { "75J", "C086" }, /* 8GB Silver iPod Touch (3rd gen) */
- { "6K2", "C008" }, /* 32GB Silver iPod Touch (3rd gen) */
- { "6K4", "C011" }, /* 64GB Silver iPod Touch (3rd gen) */
+ { "75J", "C086" }, /* 8GB iPod Touch (3rd gen) */
+ { "6K2", "C008" }, /* 32GB iPod Touch (3rd gen) */
+ { "6K4", "C011" }, /* 64GB iPod Touch (3rd gen) */
+ { "CP9", "C544" }, /* 32GB iPod Touch (4th gen) */
{ "VR0", "A501" }, /* 4GB Silver iPhone 1st gen */
{ "WH8", "A712" }, /* 8GB Silver iPhone */
@@ -1341,6 +1347,7 @@ itdb_device_supports_sqlite_db (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -1402,6 +1409,7 @@ itdb_device_supports_sparse_artwork (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -1712,6 +1720,7 @@ gboolean itdb_device_supports_video (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -1838,6 +1847,7 @@ ItdbChecksumType itdb_device_get_checksum_type (const
Itdb_Device *device)
case ITDB_IPOD_GENERATION_IPAD_1:
case ITDB_IPOD_GENERATION_IPHONE_4:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
return ITDB_CHECKSUM_HASHAB;
case ITDB_IPOD_GENERATION_UNKNOWN:
@@ -2075,6 +2085,7 @@ itdb_device_supports_podcast (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -2119,6 +2130,7 @@ gboolean itdb_device_is_shuffle (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -2170,6 +2182,7 @@ gboolean itdb_device_is_iphone_family (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
@@ -2217,6 +2230,7 @@ enum ItdbShadowDBVersion itdb_device_get_shadowdb_version
(const Itdb_Device *de
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
diff --git a/tools/generic-callout.c b/tools/generic-callout.c
index fc0a832..ebcbde5 100644
--- a/tools/generic-callout.c
+++ b/tools/generic-callout.c
@@ -140,6 +140,7 @@ get_model_name (const Itdb_IpodInfo *info)
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
return g_strdup ("touch");
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
@@ -211,6 +212,8 @@ get_generation (const Itdb_IpodInfo *info)
return 2.0;
case ITDB_IPOD_GENERATION_TOUCH_3:
return 3.0;
+ case ITDB_IPOD_GENERATION_TOUCH_4:
+ return 4.0;
case ITDB_IPOD_GENERATION_IPHONE_1:
return 1.0;
case ITDB_IPOD_GENERATION_IPHONE_2:
@@ -412,6 +415,7 @@ get_icon_name (const Itdb_IpodInfo *info)
return g_strconcat (prefix, "ipod-touch", NULL);
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
+ case ITDB_IPOD_GENERATION_TOUCH_4:
return g_strconcat (prefix, "ipod-touch-2g", NULL);
case ITDB_IPOD_GENERATION_IPHONE_1:
return g_strdup ("phone-apple-iphone");
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
