* src/itdb.h

	  src/itdb_itunesdb.c: removed mhodcount and libmhodcount from
	  Itdb_Playlist as these are only used internally and reset during
	  syncing.


git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1340 f01d2545-417e-4e96-918e-98f8d0dbbcb6

3 files changed, 27 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index c47c085..b56f078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-26  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/ithumb-writer.c (ithumb_writer_write_thumbnail): handle
+	  corrupted image data in a way that does not crash libgpod nor
+	  causes the ArtworkDB or PhotoDB to be corrupted. Currently a
+	  completely red pixmap is created as a substitute. Somewhat more
+	  artistic than I am may want to create a "corrupted image data"
+	  pixmap we can imbed into the code.
+
+	* src/itdb_artwork.c (itdb_thumb_get_gdk_pixbuf): fix failed
+	  assertion when image data is illegal.
+
 2006-11-24  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* src/itdb.h
@@ -8,6 +20,11 @@
 
 	* tests/test-photos.c: implemented new API (append at the end).
 
+	* src/itdb.h
+	  src/itdb_itunesdb.c: removed mhodcount and libmhodcount from
+	  Itdb_Playlist as these are only used internally and reset during
+	  syncing.
+
 2006-11-23  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* When adding photos to the iPod the user may or may not want to
diff --git a/src/itdb.h b/src/itdb.h
index d590485..09bf928 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-24 12:57:54 jcs>
+/* Time-stamp: <2006-11-24 20:51:44 jcs>
 |
 |  Copyright (C) 2002-2006 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -545,24 +545,8 @@ struct _Itdb_Playlist
     gint  num;            /* number of tracks in playlist          */
     GList *members;       /* tracks in playlist (Track *)          */
     gboolean is_spl;      /* smart playlist?                       */
-    guint32 timestamp;    /* some timestamp                        */
+    guint32 timestamp;    /* timestamp of playlist creation        */
     guint64 id;           /* playlist ID                           */
-    guint32 mhodcount;    /* This appears to be the number of string
-			     MHODs (type < 50) associated with this
-			     playlist (typically 0x01). Doesn't seem
-			     to be signficant unless you include Type
-			     52 MHODs. libgpod sets this to 1 when
-			     syncing */
-    guint16 libmhodcount; /* The number of Type 52 MHODs associated
-			     with this playlist. If you don't create
-			     Type 52 MHODs, this can be
-			     zero. Otherwise, if you have Type 52
-			     MHODs associated with this playlist and
-			     set this to zero, no songs appear on the
-			     iPod. jcsjcs: with iTunes 4.9 this seems
-			     to be set to 1 even without any Type 52
-			     MHODs present. libgpod sets this to 1
-			     when syncing */
     guint32 sortorder;    /* How to sort playlist -- see below     */
     guint32 podcastflag;  /* ITDB_PL_FLAG_NORM/_PODCAST            */
     SPLPref splpref;      /* smart playlist prefs                  */
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index f9284bc..42ee2b2 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-07 20:53:26 jcs>
+/* Time-stamp: <2006-11-24 20:50:01 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -1873,8 +1873,8 @@ static glong get_playlist (FImport *fimp, glong mhyp_seek)
   plitem->flag3 = get8int (cts, mhyp_seek+23);
   plitem->timestamp = get32lint (cts, mhyp_seek+24);
   plitem->id = get64lint (cts, mhyp_seek+28);
-  plitem->mhodcount = get32lint (cts, mhyp_seek+36);
-  plitem->libmhodcount = get16lint (cts, mhyp_seek+40);
+/*  plitem->mhodcount = get32lint (cts, mhyp_seek+36);   */
+/*  plitem->libmhodcount = get16lint (cts, mhyp_seek+40);*/
   plitem->podcastflag = get16lint (cts, mhyp_seek+42);
   plitem->sortorder = get32lint (cts, mhyp_seek+44);
 
@@ -3993,11 +3993,11 @@ static gboolean write_playlist (FExport *fexp,
     put8int (cts, pl->flag3);      /* unknown                   */
     put32lint (cts, pl->timestamp);/* some timestamp            */
     put64lint (cts, pl->id);       /* 64 bit ID                 */
-    pl->mhodcount = 1;             /* we only write one mhod type < 50 */
-    put32lint (cts, pl->mhodcount);
-    pl->libmhodcount = 1;          /* we don't write mhod type 52, and
-				      "1" seems to be the default */
-    put16lint (cts, pl->libmhodcount);
+    put32lint (cts, 1);            /* mhodcount: we only write
+				    * one mhod type < 50        */
+    put16lint (cts, 1);            /* libmhodcount: we don't write
+				      mhod type 52, and "1" seems to
+				      be the default            */
     put16lint (cts, pl->podcastflag);
     put32lint (cts, pl->sortorder);
     put32_n0 (cts, 15);            /* ?                         */