* itdb_itunesdb.c (itdb_get_control_dir):

	  added support for iPhones

	* itdb.h: added ITDB_IPOD_MODEL_IPHONE_1 enum

	* itdb_device.c: added iPhone description
	
	TODO: define artwork definition in itdb_device.c -- currently
	artwork is not supported.



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

3 files changed, 8 insertions, 3 deletions

diff --git a/src/itdb.h b/src/itdb.h
index 7451b15..fa3274c 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -107,7 +107,8 @@ typedef enum {
     ITDB_IPOD_MODEL_NANO_SILVER,
     ITDB_IPOD_MODEL_NANO_BLUE,
     ITDB_IPOD_MODEL_NANO_GREEN,
-    ITDB_IPOD_MODEL_NANO_PINK
+    ITDB_IPOD_MODEL_NANO_PINK,
+    ITDB_IPOD_MODEL_IPHONE_1
 } Itdb_IpodModel;
 
 struct _Itdb_IpodInfo {
diff --git a/src/itdb_device.c b/src/itdb_device.c
index 9af6030..cc78dcf 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -159,7 +159,8 @@ static const Itdb_IpodInfo ipod_info_table [] = {
      * one entry, e.g.:
        ModelNumStr: Mmobile1
     */
-    {"mobile1", -1, ITDB_IPOD_MODEL_MOBILE_1, ITDB_IPOD_GENERATION_MOBILE},
+    {"mobile1", -1, ITDB_IPOD_MODEL_MOBILE_1, ITDB_IPOD_GENERATION_MOBILE,  6},
+    {"iPhone1", -1, ITDB_IPOD_MODEL_IPHONE_1, ITDB_IPOD_GENERATION_MOBILE, 14},
 
     {NULL, 0, 0, 0, 0}
 };
@@ -189,6 +190,7 @@ static const gchar *ipod_model_name_table [] = {
 	N_("Nano (Blue)"),
 	N_("Nano (Green)"),
 	N_("Nano (Pink)"),
+	N_("iPhone (1)"),
 	NULL
 };
 
@@ -264,6 +266,7 @@ static const Itdb_ArtworkFormat *ipod_artwork_info_table[] = {
 	ipod_nano_artwork_info,    /* Nano (Blue)   */
 	ipod_nano_artwork_info,    /* Nano (Green)  */
 	ipod_nano_artwork_info,    /* Nano (Pink)   */
+	NULL,                      /* iPhone (1) -- FIXME! */
 	NULL
 };
 
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index e6160e1..1ed0c1c 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -6012,9 +6012,10 @@ gchar *itdb_get_control_dir (const gchar *mountpoint)
 {
     gchar *p_ipod[] = {"iPod_Control", NULL};
     gchar *p_mobile[] = {"iTunes", "iTunes_Control", NULL};
+    gchar *p_iphone[] = {"iTunes_Control", NULL};
     /* Use an array with all possibilities, so further extension will
        be easy */
-    gchar **paths[] = {p_ipod, p_mobile, NULL};
+    gchar **paths[] = {p_ipod, p_mobile, p_iphone, NULL};
     gchar ***ptr;
     gchar *result = NULL;