Revision: 1717
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1717&view=rev
Author:   teuf
Date:     2007-10-05 12:13:37 -0700 (Fri, 05 Oct 2007)

Log Message:
-----------
* src/itdb_itunesdb.c: (itdb_write_file): set Itdb_Track::id
before writing the artwork since artwork writing uses them

Modified Paths:
--------------
    libgpod/trunk/ChangeLog
    libgpod/trunk/src/itdb_itunesdb.c

Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog     2007-10-03 20:59:45 UTC (rev 1716)
+++ libgpod/trunk/ChangeLog     2007-10-05 19:13:37 UTC (rev 1717)
@@ -1,3 +1,8 @@
+2007-10-05  Christophe Fergeau  <[EMAIL PROTECTED]>
+
+       * src/itdb_itunesdb.c: (itdb_write_file): set Itdb_Track::id
+       before writing the artwork since artwork writing uses them
+
 2007-10-01  Christophe Fergeau <[EMAIL PROTECTED]>
 
        * README.SysInfo: add explanations about how the iPod needs to be 

Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c   2007-10-03 20:59:45 UTC (rev 1716)
+++ libgpod/trunk/src/itdb_itunesdb.c   2007-10-05 19:13:37 UTC (rev 1717)
@@ -4931,25 +4931,29 @@
     if (!itdb->device->byte_order)
        itdb_device_autodetect_endianess (itdb->device);
 
+    fexp = g_new0 (FExport, 1);
+    fexp->itdb = itdb;
+    fexp->wcontents = wcontents_new (filename);
+    cts = fexp->wcontents;
+
+    cts->reversed = (itdb->device->byte_order == G_BIG_ENDIAN);
+
+    prepare_itdb_for_write (fexp);
+
 #if HAVE_GDKPIXBUF
     /* only write ArtworkDB if we deal with an iPod
        FIXME: figure out a way to store the artwork data when storing
        to local directories. At the moment it's the application's task
        to handle this. */
+    /* The ArtworkDB must be written after the call to
+     * prepare_itdb_for_write since it needs Itdb_Track::id to be set
+     * to its final value to write properly on nano video/ipod classics
+     */
     if (itdb_device_supports_artwork (itdb->device)) {
                ipod_write_artwork_db (itdb);
     }
 #endif
 
-    fexp = g_new0 (FExport, 1);
-    fexp->itdb = itdb;
-    fexp->wcontents = wcontents_new (filename);
-    cts = fexp->wcontents;
-
-    cts->reversed = (itdb->device->byte_order == G_BIG_ENDIAN);
-
-    prepare_itdb_for_write (fexp);
-    
     mk_mhbd (fexp, 3);   /* three mhsds */
     /* write tracklist */
     if (write_mhsd_tracks (fexp))


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