commit a42c002575fe82498c042a33f6960fbd1eba8647
Author: Christophe Fergeau <cferg...@mandriva.com>
Date: Fri Jul 23 22:37:32 2010 +0200
add iPhone 4G black models
src/itdb.h | 4 +++-
src/itdb_device.c | 13 +++++++++++++
tools/generic-callout.c | 5 +++++
3 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/src/itdb.h b/src/itdb.h
index 163e47f..4f6d1e8 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -123,6 +123,7 @@ typedef struct _Itdb_Chapterdata Itdb_Chapterdata;
* @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)
+ * @ITDB_IPOD_GENERATION_IPHONE_4: Fourth Generation iPhone
*
* iPod generation information
*
@@ -161,7 +162,8 @@ typedef enum {
ITDB_IPOD_GENERATION_CLASSIC_3,
ITDB_IPOD_GENERATION_NANO_5,
ITDB_IPOD_GENERATION_TOUCH_3,
- ITDB_IPOD_GENERATION_IPAD_1
+ ITDB_IPOD_GENERATION_IPAD_1,
+ ITDB_IPOD_GENERATION_IPHONE_4
} Itdb_IpodGeneration;
/**
diff --git a/src/itdb_device.c b/src/itdb_device.c
index 0df0521..a90a675 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -299,6 +299,9 @@ static const Itdb_IpodInfo ipod_info_table [] = {
{"C131", 16, ITDB_IPOD_MODEL_IPHONE_BLACK,
ITDB_IPOD_GENERATION_IPHONE_3, 50},
{"C133", 32, ITDB_IPOD_MODEL_IPHONE_BLACK,
ITDB_IPOD_GENERATION_IPHONE_3, 50},
{"C134", 32, ITDB_IPOD_MODEL_IPHONE_WHITE,
ITDB_IPOD_GENERATION_IPHONE_3, 50},
+ /* iPhone 4G */
+ {"C603", 16, ITDB_IPOD_MODEL_IPHONE_BLACK,
ITDB_IPOD_GENERATION_IPHONE_4, 50},
+ {"C605", 32, ITDB_IPOD_MODEL_IPHONE_BLACK,
ITDB_IPOD_GENERATION_IPHONE_4, 50},
/* iPad */
{"B292", 16, ITDB_IPOD_MODEL_IPAD, ITDB_IPOD_GENERATION_IPAD_1,
50},
@@ -817,6 +820,8 @@ static const ItdbSerialToModel serial_to_model_mapping[] = {
{ "3NP", "C131" }, /* 16GB Black iPhone 3GS */
{ "3NR", "C133" }, /* 32GB Black iPhone 3GS */
{ "3NS", "C134" }, /* 32GB White iPhone 3GS */
+ { "A4S", "C603" }, /* 16GB Black iPhone 4G */
+ { "A4T", "C605" }, /* 32GB Black iPhone 4G */
{ "Z38", "B292" }, /* 16GB iPad with Wifi */
{ "Z39", "B293" }, /* 32GB iPad with Wifi */
@@ -1339,6 +1344,7 @@ itdb_device_supports_sqlite_db (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
/* FIXME: needs to check firmware version */
return TRUE;
@@ -1399,6 +1405,7 @@ itdb_device_supports_sparse_artwork (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
supports_sparse_artwork = TRUE;
break;
@@ -1708,6 +1715,7 @@ gboolean itdb_device_supports_video (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
return TRUE;
}
@@ -1829,6 +1837,7 @@ ItdbChecksumType itdb_device_get_checksum_type (const
Itdb_Device *device)
return ITDB_CHECKSUM_HASH72;
case ITDB_IPOD_GENERATION_IPAD_1:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
return ITDB_CHECKSUM_HASHAB;
case ITDB_IPOD_GENERATION_UNKNOWN:
@@ -2069,6 +2078,7 @@ itdb_device_supports_podcast (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
return TRUE;
}
@@ -2112,6 +2122,7 @@ gboolean itdb_device_is_shuffle (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
return FALSE;
case ITDB_IPOD_GENERATION_SHUFFLE_1:
@@ -2162,6 +2173,7 @@ gboolean itdb_device_is_iphone_family (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
return TRUE;
}
@@ -2208,6 +2220,7 @@ enum ItdbShadowDBVersion itdb_device_get_shadowdb_version
(const Itdb_Device *de
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
case ITDB_IPOD_GENERATION_IPAD_1:
version = ITDB_SHADOW_DB_UNKNOWN;
break;
diff --git a/tools/generic-callout.c b/tools/generic-callout.c
index 873a158..fc0a832 100644
--- a/tools/generic-callout.c
+++ b/tools/generic-callout.c
@@ -144,6 +144,7 @@ get_model_name (const Itdb_IpodInfo *info)
case ITDB_IPOD_GENERATION_IPHONE_1:
case ITDB_IPOD_GENERATION_IPHONE_2:
case ITDB_IPOD_GENERATION_IPHONE_3:
+ case ITDB_IPOD_GENERATION_IPHONE_4:
return g_strdup ("phone");
case ITDB_IPOD_GENERATION_IPAD_1:
return g_strdup ("ipad");
@@ -216,6 +217,8 @@ get_generation (const Itdb_IpodInfo *info)
return 2.0;
case ITDB_IPOD_GENERATION_IPHONE_3:
return 3.0;
+ case ITDB_IPOD_GENERATION_IPHONE_4:
+ return 4.0;
case ITDB_IPOD_GENERATION_IPAD_1:
return 1.0;
case ITDB_IPOD_GENERATION_MOBILE:
@@ -416,6 +419,8 @@ get_icon_name (const Itdb_IpodInfo *info)
return g_strdup ("phone-apple-iphone-3g");
case ITDB_IPOD_GENERATION_IPHONE_3:
return g_strdup ("phone-apple-iphone-3gs");
+ case ITDB_IPOD_GENERATION_IPHONE_4:
+ return g_strdup ("phone-apple-iphone-4g");
case ITDB_IPOD_GENERATION_IPAD_1:
return g_strdup ("computer-apple-ipad");
case ITDB_IPOD_GENERATION_MOBILE:
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
