summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcsjcs <jcsjcs@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2008-06-05 12:14:27 +0000
committerjcsjcs <jcsjcs@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2008-06-05 12:14:27 +0000
commita27ee115b3bf80ede26793618cbb40778c33515f (patch)
tree69e3a1fe7f07e3a71f4b846007e0d30396c316f7
parent1199a7fbfb40d0378e92baebc06a4c4d28368711 (diff)
downloadlibgpod-a27ee115b3bf80ede26793618cbb40778c33515f.tar.gz
libgpod-a27ee115b3bf80ede26793618cbb40778c33515f.tar.xz
libgpod-a27ee115b3bf80ede26793618cbb40778c33515f.zip
* src/itdb_track.c (itdb_track_remove_thumbnails): set mhii_link
to 0. * src/db-artwork-parser.c (mhfd_associate_itunesdb_artwork): remove thumbnails if mhii_link is invalid. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2006 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog8
-rw-r--r--src/db-artwork-parser.c4
-rw-r--r--src/itdb_track.c1
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 495ebb0..0789ab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-06-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ * src/itdb_track.c (itdb_track_remove_thumbnails): set mhii_link
+ to 0.
+
+ * src/db-artwork-parser.c (mhfd_associate_itunesdb_artwork):
+ remove thumbnails if mhii_link is invalid.
+
+2008-06-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
* src/gchecksum.c
src/gchecksum.h
src/Makefile.am
diff --git a/src/db-artwork-parser.c b/src/db-artwork-parser.c
index e993eee..938dbef 100644
--- a/src/db-artwork-parser.c
+++ b/src/db-artwork-parser.c
@@ -563,6 +563,10 @@ mhfd_associate_itunesdb_artwork (DBParseContext *ctx)
gchar *strval = g_strdup_printf("%" G_GINT64_FORMAT, track->dbid);
g_print (_("Could not find artwork entry (mhii id: %u) for track (dbid: %s).\n"), track->mhii_link, strval);
g_free (strval);
+
+ /* couldn't find artwork -- make sure track data is in
+ a consistent state. */
+ itdb_track_remove_thumbnails (track);
}
}
}
diff --git a/src/itdb_track.c b/src/itdb_track.c
index 163ace5..b966a8b 100644
--- a/src/itdb_track.c
+++ b/src/itdb_track.c
@@ -532,6 +532,7 @@ void itdb_track_remove_thumbnails (Itdb_Track *track)
itdb_artwork_remove_thumbnails (track->artwork);
track->artwork_size = 0;
track->artwork_count = 0;
+ track->mhii_link = 0;
/* indicate no artwork is present */
track->has_artwork = 0x02;
}