Revision: 1682
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1682&view=rev
Author: jcsjcs
Date: 2007-08-17 23:31:24 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
* src/itdb_itunesdb (itdb_parse): don't call
ipod_parse_artwork_db() if iTunesDB was not read successfully.
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/itdb_itunesdb.c
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2007-08-18 06:16:04 UTC (rev 1681)
+++ libgpod/trunk/ChangeLog 2007-08-18 06:31:24 UTC (rev 1682)
@@ -12,6 +12,10 @@
* src/itdb_itunesdb.c: make calls to utf16_strlen()
unnecessary. Thanks to Javier Kohen for the patch.
+ * src/itdb_itunesdb (itdb_parse): don't call
+ ipod_parse_artwork_db() if iTunesDB was not read successfully.
+
+
2007-08-07 Nicholas Piper <nicholas at users.sourceforge.net>
* bindings/python/gpod.i.in: Return an integer for time_t (note,
Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c 2007-08-18 06:16:04 UTC (rev 1681)
+++ libgpod/trunk/src/itdb_itunesdb.c 2007-08-18 06:31:24 UTC (rev 1682)
@@ -2937,33 +2937,36 @@
itdb_set_mountpoint (itdb, mp);
itdb->filename = filename;
success = itdb_parse_internal (itdb, error);
- if (!success) {
+ if (success)
+ {
+ /* We don't test the return value of ipod_parse_artwork_db
+ * since the database content will be consistent even if
+ * we fail to get the various thumbnails, we ignore the
+ * error since older ipods don't have thumbnails.
+
+ * FIXME: this probably should go into itdb_parse_file,
+ * but I don't understand its purpose, and
+ * ipod_parse_artwork_db needs the mountpoint field from
+ * the itdb, which may not be available in the other
+ * function
+
+ * JCS: itdb_parse_file is used to read local repositories
+ * (usually repositories stored in
+ * ~/.gtkpod). ipod_parse_artwork_db (and the
+ * corresponding artbook write function) should probably
+ * be expanded to look for (write) the required files into
+ * the same directory as itdb->filename in case
+ * itdb->mountpoint does not exist. Because several local
+ * repositories may exist in the same directory, the names
+ * should be modified by the repository name.
+ */
+ ipod_parse_artwork_db (itdb);
+ }
+ else
+ {
itdb_free (itdb);
itdb = NULL;
}
- /* We don't test the return value of ipod_parse_artwork_db
- * since the database content will be consistent even if
- * we fail to get the various thumbnails, we ignore the
- * error since older ipods don't have thumbnails.
-
- * FIXME: this probably should go into itdb_parse_file,
- * but I don't understand its purpose, and
- * ipod_parse_artwork_db needs the mountpoint field from
- * the itdb, which may not be available in the other
- * function
-
- * JCS: itdb_parse_file is used to read local repositories
- * (usually repositories stored in
- * ~/.gtkpod). ipod_parse_artwork_db (and the
- * corresponding artbook write function) should probably
- * be expanded to look for (write) the required files into
- * the same directory as itdb->filename in case
- * itdb->mountpoint does not exist. Because several local
- * repositories may exist in the same directory, the names
- * should be modified by the repository name.
- */
- ipod_parse_artwork_db (itdb);
-
}
}
else
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
