commit ca7b73865415a09094c78e72ae3cba150352cf02
Author: Christophe Fergeau <t...@gnome.org>
Date: Fri Sep 24 18:15:31 2010 +0200
Add Nano 6th gen to the various enums
This device uses an hash AB in both its iTunesCDB and its
Locations.itdb.cbk files so it's unfortunately impossible to write
to it for now.
src/itdb.h | 3 ++-
src/itdb_device.c | 8 ++++++++
tools/generic-callout.c | 4 ++++
3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/src/itdb.h b/src/itdb.h
index f81d987..7e7586a 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -165,7 +165,8 @@ typedef enum {
ITDB_IPOD_GENERATION_TOUCH_3,
ITDB_IPOD_GENERATION_IPAD_1,
ITDB_IPOD_GENERATION_IPHONE_4,
- ITDB_IPOD_GENERATION_TOUCH_4
+ ITDB_IPOD_GENERATION_TOUCH_4,
+ ITDB_IPOD_GENERATION_NANO_6
} Itdb_IpodGeneration;
/**
diff --git a/src/itdb_device.c b/src/itdb_device.c
index 90549cd..63467a6 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -1345,6 +1345,7 @@ itdb_device_supports_sqlite_db (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_CLASSIC_3:
return FALSE;
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
case ITDB_IPOD_GENERATION_TOUCH_1:
case ITDB_IPOD_GENERATION_TOUCH_2:
case ITDB_IPOD_GENERATION_TOUCH_3:
@@ -1404,6 +1405,7 @@ itdb_device_supports_sparse_artwork (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
case ITDB_IPOD_GENERATION_CLASSIC_1:
case ITDB_IPOD_GENERATION_CLASSIC_2:
case ITDB_IPOD_GENERATION_CLASSIC_3:
@@ -1709,6 +1711,7 @@ gboolean itdb_device_supports_video (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_SHUFFLE_4:
case ITDB_IPOD_GENERATION_NANO_1:
case ITDB_IPOD_GENERATION_NANO_2:
+ case ITDB_IPOD_GENERATION_NANO_6:
return FALSE;
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
@@ -1849,6 +1852,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:
+ case ITDB_IPOD_GENERATION_NANO_6:
return ITDB_CHECKSUM_HASHAB;
case ITDB_IPOD_GENERATION_UNKNOWN:
@@ -2074,6 +2078,7 @@ itdb_device_supports_podcast (const Itdb_Device *device)
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
case ITDB_IPOD_GENERATION_SHUFFLE_1:
case ITDB_IPOD_GENERATION_SHUFFLE_2:
case ITDB_IPOD_GENERATION_SHUFFLE_3:
@@ -2123,6 +2128,7 @@ gboolean itdb_device_is_shuffle (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
case ITDB_IPOD_GENERATION_VIDEO_1:
case ITDB_IPOD_GENERATION_VIDEO_2:
case ITDB_IPOD_GENERATION_CLASSIC_1:
@@ -2170,6 +2176,7 @@ gboolean itdb_device_is_iphone_family (const Itdb_Device
*device)
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
case ITDB_IPOD_GENERATION_SHUFFLE_1:
case ITDB_IPOD_GENERATION_SHUFFLE_2:
case ITDB_IPOD_GENERATION_SHUFFLE_3:
@@ -2223,6 +2230,7 @@ enum ItdbShadowDBVersion itdb_device_get_shadowdb_version
(const Itdb_Device *de
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
case ITDB_IPOD_GENERATION_VIDEO_1:
case ITDB_IPOD_GENERATION_VIDEO_2:
case ITDB_IPOD_GENERATION_CLASSIC_1:
diff --git a/tools/generic-callout.c b/tools/generic-callout.c
index ebcbde5..d49d01f 100644
--- a/tools/generic-callout.c
+++ b/tools/generic-callout.c
@@ -129,6 +129,7 @@ get_model_name (const Itdb_IpodInfo *info)
case ITDB_IPOD_GENERATION_NANO_3:
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
return g_strdup ("nano");
case ITDB_IPOD_GENERATION_VIDEO_1:
case ITDB_IPOD_GENERATION_VIDEO_2:
@@ -197,6 +198,8 @@ get_generation (const Itdb_IpodInfo *info)
return 4.0;
case ITDB_IPOD_GENERATION_NANO_5:
return 5.0;
+ case ITDB_IPOD_GENERATION_NANO_6:
+ return 6.0;
case ITDB_IPOD_GENERATION_VIDEO_1:
return 5.0;
case ITDB_IPOD_GENERATION_VIDEO_2:
@@ -389,6 +392,7 @@ get_icon_name (const Itdb_IpodInfo *info)
case ITDB_IPOD_GENERATION_NANO_4:
case ITDB_IPOD_GENERATION_NANO_5:
+ case ITDB_IPOD_GENERATION_NANO_6:
/* FIXME: set the correct icon name once it's added to
* gnome-icon-theme-extras
*/
------------------------------------------------------------------------------
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
