Revision: 1690
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1690&view=rev
Author:   jcsjcs
Date:     2007-09-04 09:10:05 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
        * 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.

Modified Paths:
--------------
    libgpod/trunk/ChangeLog
    libgpod/trunk/docs/reference/tmpl/device.sgml
    libgpod/trunk/src/itdb.h
    libgpod/trunk/src/itdb_device.c
    libgpod/trunk/src/itdb_itunesdb.c

Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog     2007-09-02 18:15:36 UTC (rev 1689)
+++ libgpod/trunk/ChangeLog     2007-09-04 16:10:05 UTC (rev 1690)
@@ -1,3 +1,15 @@
+2007-09-4 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * 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.
+
 2007-08-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
        * src/db-artwork-writer.c (write_mhod_type_3): don't assume that

Modified: libgpod/trunk/docs/reference/tmpl/device.sgml
===================================================================
--- libgpod/trunk/docs/reference/tmpl/device.sgml       2007-09-02 18:15:36 UTC 
(rev 1689)
+++ libgpod/trunk/docs/reference/tmpl/device.sgml       2007-09-04 16:10:05 UTC 
(rev 1690)
@@ -214,6 +214,7 @@
 @ITDB_IPOD_MODEL_NANO_BLUE: 
 @ITDB_IPOD_MODEL_NANO_GREEN: 
 @ITDB_IPOD_MODEL_NANO_PINK: 
[EMAIL PROTECTED]: 
 
 <!-- ##### STRUCT Itdb_ArtworkFormat ##### -->
 <para>

Modified: libgpod/trunk/src/itdb.h
===================================================================
--- libgpod/trunk/src/itdb.h    2007-09-02 18:15:36 UTC (rev 1689)
+++ libgpod/trunk/src/itdb.h    2007-09-04 16:10:05 UTC (rev 1690)
@@ -107,7 +107,8 @@
     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 {

Modified: libgpod/trunk/src/itdb_device.c
===================================================================
--- libgpod/trunk/src/itdb_device.c     2007-09-02 18:15:36 UTC (rev 1689)
+++ libgpod/trunk/src/itdb_device.c     2007-09-04 16:10:05 UTC (rev 1690)
@@ -159,7 +159,8 @@
      * 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 @@
        N_("Nano (Blue)"),
        N_("Nano (Green)"),
        N_("Nano (Pink)"),
+       N_("iPhone (1)"),
        NULL
 };
 
@@ -264,6 +266,7 @@
        ipod_nano_artwork_info,    /* Nano (Blue)   */
        ipod_nano_artwork_info,    /* Nano (Green)  */
        ipod_nano_artwork_info,    /* Nano (Pink)   */
+       NULL,                      /* iPhone (1) -- FIXME! */
        NULL
 };
 

Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c   2007-09-02 18:15:36 UTC (rev 1689)
+++ libgpod/trunk/src/itdb_itunesdb.c   2007-09-04 16:10:05 UTC (rev 1690)
@@ -6012,9 +6012,10 @@
 {
     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;
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to