Patch from Filippo Giunchedi <filippo@esaurito.net>

* src/db-artwork-debug.c: (dump_mhba): fix dumping function in debug
mode
* src/db-itunes-parser.h: indentation fixes


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

3 files changed, 26 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index a86b8ac..66fd41f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-10-21  Christophe Fergeau  <teuf@gnome.org>
 
+	Patch from Filippo Giunchedi <filippo@esaurito.net>
+
+	* src/db-artwork-debug.c: (dump_mhba): fix dumping function in debug
+	mode
+	* src/db-itunes-parser.h: indentation fixes
+
+2007-10-21  Christophe Fergeau  <teuf@gnome.org>
+
 	* src/itdb_photoalbum.c: (itdb_get_photos_dir):
 	* src/ithumb-writer.c: (ipod_image_get_ithmb_filename):
 
diff --git a/src/db-artwork-debug.c b/src/db-artwork-debug.c
index 664b605..b7e477a 100644
--- a/src/db-artwork-debug.c
+++ b/src/db-artwork-debug.c
@@ -220,15 +220,21 @@ dump_mhba (MhbaHeader *mhba)
 	g_print ("\tTotal length: %d\n", GINT_FROM_LE (mhba->total_len));
 	g_print ("\tNumber of Data Objects: %d\n", GINT_FROM_LE (mhba->num_mhods));
 	g_print ("\tNumber of pictures in the album: %d\n", GINT_FROM_LE (mhba->num_mhias));
-	g_print ("\tPlaylist ID: %08x\n", GINT_FROM_LE (mhba->playlist_id));
-	g_print ("\tUnknown2: %08x\n", GINT_FROM_LE (mhba->unknown2));
-	g_print ("\tUnknown3: %04x\n", GINT_FROM_LE (mhba->unknown3));
-	g_print ("\tMaster playlist: %02x\n", GINT_FROM_LE (mhba->master));
-	g_print ("\tRepeat: %02x\n", GINT_FROM_LE (mhba->repeat));
-	g_print ("\tRandom: %02x\n", GINT_FROM_LE (mhba->random));
-	g_print ("\tTransition direction: %02x\n", GINT_FROM_LE (mhba->transition_direction));
+	g_print ("\tAlbum ID: %08x\n", GINT_FROM_LE (mhba->album_id));
+	g_print ("\tUnk024: %04x\n", GINT_FROM_LE (mhba->unk024));
+	g_print ("\tUnk028: %04x\n", GINT16_FROM_LE (mhba->unk028));
+	g_print ("\tAlbum type: %02x\n", GUINT_FROM_LE (mhba->album_type));
+	g_print ("\tPlay music: %02x\n", GUINT_FROM_LE (mhba->playmusic));
+	g_print ("\tRepeat: %02x\n", GUINT_FROM_LE (mhba->repeat));
+	g_print ("\tRandom: %02x\n", GUINT_FROM_LE (mhba->random));
+	g_print ("\tShow titles: %02x\n", GUINT_FROM_LE (mhba->show_titles));
+	g_print ("\tTransition direction: %02x\n", GUINT_FROM_LE (mhba->transition_direction));
 	g_print ("\tSlide duration: %08x\n", GINT_FROM_LE (mhba->slide_duration));
-	g_print ("\tPrev playlist ID: %08x\n", GINT_FROM_LE (mhba->prev_playlist_id));
+	g_print ("\tTransition duration: %08x\n", GINT_FROM_LE (mhba->transition_duration));
+	g_print ("\tUnk044: %02x\n", GINT_FROM_LE (mhba->unk044));
+	g_print ("\tUnk048: %02x\n", GINT_FROM_LE (mhba->unk048));
+	g_print ("\tSong ID: %08x\n", GINT_FROM_LE (mhba->song_id));
+	g_print ("\tPrevious album ID: %08x\n", GINT_FROM_LE (mhba->prev_album_id));
 }
 
 #endif
diff --git a/src/db-itunes-parser.h b/src/db-itunes-parser.h
index b699283..f6366b0 100644
--- a/src/db-itunes-parser.h
+++ b/src/db-itunes-parser.h
@@ -20,7 +20,7 @@
  * 
  *  This product is not supported/written/published by Apple!
  *
- * $Id: db-itunes-parser.h,v 1.11 2007/04/27 14:09:59 jcsjcs Exp $
+ * $Id$
  */
 
 
@@ -631,13 +631,13 @@ struct _MhbaHeader {
 	guint8 repeat;     /* repeat the slideshow (from iPhoto setting) */
 	guint8 random;     /* show the slides in random order (from iPhoto
 			      setting) */
-        guint8 show_titles;/* show slide captions (from iPhoto setting) */
+	guint8 show_titles;/* show slide captions (from iPhoto setting) */
 	guint8 transition_direction; /* 0=none, 1=left-to-right,
 			      2=right-to-left, 3=top-to-bottom,
 			      4=bottom-to-top (from iPhoto setting) */
-        gint32 slide_duration; /* in seconds (from iPhoto setting) */
+	gint32 slide_duration; /* in seconds (from iPhoto setting) */
 	gint32 transition_duration; /* in milliseconds (from iPhoto setting) */
-        gint32 unk044;     /* unknown, seems to always be 0 */
+	gint32 unk044;     /* unknown, seems to always be 0 */
 	gint32 unk048;     /* unknown, seems to always be 0 */
 	gint64 song_id;    /* dbid2 of track in iTunesDB to play during
 			      slideshow (from iPhoto setting) */