summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorg Schuler <jcsjcs@users.sourceforge.net>2006-03-18 01:24:40 +0000
committerJorg Schuler <jcsjcs@users.sourceforge.net>2006-03-18 01:24:40 +0000
commitff171997e60826a2c45913360af15fba56acf0ac (patch)
treebe30c2fd5a1cb4f1923166c43884a4e8b7fb53f5
parentec6aa2f0908fae9d7b1162af530fc0fb3bc78c7e (diff)
downloadlibgpod-ff171997e60826a2c45913360af15fba56acf0ac.tar.gz
libgpod-ff171997e60826a2c45913360af15fba56acf0ac.tar.xz
libgpod-ff171997e60826a2c45913360af15fba56acf0ac.zip
* itdb_itunesdb.c (itdb_write_file): move endianess autodetection
to a place before calling ipod_write_artwork_db(). git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1224 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog3
-rw-r--r--src/itdb_artwork.c4
-rw-r--r--src/itdb_itunesdb.c9
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index dfe6897..993595e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* itdb_itunesdb.c (mk_mhod): fixed bug when writing podcast urls.
+ * itdb_itunesdb.c (itdb_write_file): move endianess autodetection
+ to a place before calling ipod_write_artwork_db().
+
2005-02-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
* itdb_device.[ch]: rewrote ipod-device.c, removed all hal-code,
diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c
index a233486..3bc8260 100644
--- a/src/itdb_artwork.c
+++ b/src/itdb_artwork.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-03-16 22:30:22 jcs>
+/* Time-stamp: <2006-03-18 01:23:13 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -82,7 +82,7 @@ Itdb_Artwork *itdb_artwork_duplicate (Itdb_Artwork *artwork)
Itdb_Artwork *dup;
g_return_val_if_fail (artwork, NULL);
- dup = itdb_artwork_new ();
+ dup = g_new0 (Itdb_Artwork, 1);
memcpy (dup, artwork, sizeof (Itdb_Artwork));
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index 5f95674..062545b 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-03-18 00:38:18 jcs>
+/* Time-stamp: <2006-03-18 10:21:27 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -4104,6 +4104,10 @@ gboolean itdb_write_file (Itdb_iTunesDB *itdb, const gchar *filename,
if (!filename) filename = itdb->filename;
+ /* set endianess flag */
+ if (!itdb->device->endianess_set)
+ itdb_device_autodetect_endianess (itdb->device);
+
#if HAVE_GDKPIXBUF
/* only write ArtworkDB if we deal with an iPod
FIXME: figure out a way to store the artwork data when storing
@@ -4118,9 +4122,6 @@ gboolean itdb_write_file (Itdb_iTunesDB *itdb, const gchar *filename,
fexp->wcontents = wcontents_new (filename);
cts = fexp->wcontents;
- /* set endianess flag */
- if (!itdb->device->endianess_set)
- itdb_device_autodetect_endianess (itdb->device);
cts->reversed = itdb->device->endianess_reversed;
reassign_ids (fexp);