Revision: 1948
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1948&view=rev
Author: teuf
Date: 2008-02-03 10:53:55 -0800 (Sun, 03 Feb 2008)
Log Message:
-----------
Adapt artwork debugging code to the mhod string parsing consolidation
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/db-artwork-debug.c
libgpod/trunk/src/db-artwork-debug.h
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-02-03 18:53:45 UTC (rev 1947)
+++ libgpod/trunk/ChangeLog 2008-02-03 18:53:55 UTC (rev 1948)
@@ -1,5 +1,11 @@
2008-02-03 Christophe Fergeau <[EMAIL PROTECTED]>
+ * src/db-artwork-debug.c:
+ * src/db-artwork-debug.h: fix mhod type1 and mhod type3 dumping
+ when debugging is enabled
+
+2008-02-03 Christophe Fergeau <[EMAIL PROTECTED]>
+
* src/db-artwork-debug.h: merge mhod type1 and mhod type3 dumping
functions
* src/db-artwork-writer.c: adjust to the change above
Modified: libgpod/trunk/src/db-artwork-debug.c
===================================================================
--- libgpod/trunk/src/db-artwork-debug.c 2008-02-03 18:53:45 UTC (rev
1947)
+++ libgpod/trunk/src/db-artwork-debug.c 2008-02-03 18:53:55 UTC (rev
1948)
@@ -70,39 +70,22 @@
return result;
}
-G_GNUC_INTERNAL void
-dump_mhod_type_1 (MhodHeaderArtworkType1 *mhod1)
-{
- g_print ("MHOD [artwork type 1] (%d):\n", sizeof
(MhodHeaderArtworkType1));
- g_print ("\tHeader length: %d\n", GINT_FROM_LE (mhod1->header_len));
- g_print ("\tTotal length: %d\n", GINT_FROM_LE (mhod1->total_len));
- g_print ("\tPadding: %04x\n", GINT_FROM_LE (mhod1->padding));
- g_print ("\tType: %04x\n", GINT_FROM_LE (mhod1->type));
- g_print ("\tUnknown1: %08x\n", GINT_FROM_LE (mhod1->unknown1));
- g_print ("\tUnknown2: %08x\n", GINT_FROM_LE (mhod1->unknown2));
- g_print ("\tString length: %u\n", GINT_FROM_LE (mhod1->string_len));
- g_print ("\tUnknown3: %08x\n", GINT_FROM_LE (mhod1->unknown3));
- g_print ("\tUnknown4: %08x\n", GINT_FROM_LE (mhod1->unknown4));
- /* FIXME: do I need to translate UTF-8 to local encoding? */
- g_print ("\tString: \"%.*s\"\n", GINT_FROM_LE (mhod1->string_len),
mhod1->string);
-}
-
G_GNUC_INTERNAL void
-dump_mhod_type_3 (ArtworkDB_MhodHeaderArtworkType3 *mhod3)
+dump_mhod_string (ArtworkDB_MhodHeaderString *mhod)
{
gchar *str;
- g_print ("MHOD [artwork type 3] (%d):\n", sizeof
(ArtworkDB_MhodHeaderArtworkType3));
- g_print ("\tHeader length: %d\n", GINT_FROM_LE (mhod3->header_len));
- g_print ("\tTotal length: %d\n", GINT_FROM_LE (mhod3->total_len));
- g_print ("\tPadding: %04x\n", GINT_FROM_LE (mhod3->padding));
- g_print ("\tType: %04x\n", GINT_FROM_LE (mhod3->type));
- g_print ("\tUnknown1: %08x\n", GINT_FROM_LE (mhod3->unknown1));
- g_print ("\tUnknown2: %08x\n", GINT_FROM_LE (mhod3->unknown2));
- g_print ("\tString length: %u\n", GINT_FROM_LE (mhod3->string_len));
- g_print ("\tMHOD version: %u\n", GINT_FROM_LE (mhod3->mhod_version));
- g_print ("\tUnknown4: %08x\n", GINT_FROM_LE (mhod3->unknown4));
- str = get_utf16_string (mhod3->string, GINT_FROM_LE
(mhod3->string_len));
+ g_print ("MHOD [artwork type string] (%d):\n", sizeof
(ArtworkDB_MhodHeaderString));
+ g_print ("\tHeader length: %d\n", GINT_FROM_LE (mhod->header_len));
+ g_print ("\tTotal length: %d\n", GINT_FROM_LE (mhod->total_len));
+ g_print ("\tPadding: %04x\n", GINT_FROM_LE (mhod->padding_len));
+ g_print ("\tType: %04x\n", GINT_FROM_LE (mhod->type));
+ g_print ("\tUnknown1: %08x\n", GINT_FROM_LE (mhod->unknown1));
+ g_print ("\tUnknown2: %08x\n", GINT_FROM_LE (mhod->unknown2));
+ g_print ("\tString length: %u\n", GINT_FROM_LE (mhod->string_len));
+ g_print ("\tEncoding: %u\n", GINT_FROM_LE (mhod->encoding));
+ g_print ("\tUnknown4: %08x\n", GINT_FROM_LE (mhod->unknown4));
+ str = get_utf16_string (mhod->string, GINT_FROM_LE (mhod->string_len));
g_print ("\tString: %s\n", str);
g_free (str);
}
Modified: libgpod/trunk/src/db-artwork-debug.h
===================================================================
--- libgpod/trunk/src/db-artwork-debug.h 2008-02-03 18:53:45 UTC (rev
1947)
+++ libgpod/trunk/src/db-artwork-debug.h 2008-02-03 18:53:55 UTC (rev
1948)
@@ -27,13 +27,12 @@
#include "db-itunes-parser.h"
-/*#define DEBUG_ARTWORKDB*/
+/* #define DEBUG_ARTWORKDB */
#ifdef DEBUG_ARTWORKDB
extern G_GNUC_INTERNAL void dump_mhif (MhifHeader *mhif);
extern G_GNUC_INTERNAL void dump_mhia (MhiaHeader *mhia);
-extern G_GNUC_INTERNAL void dump_mhod_type_1 (MhodHeaderArtworkType1 *mhod);
-extern G_GNUC_INTERNAL void dump_mhod_type_3 (ArtworkDB_MhodHeaderArtworkType3
*mhod);
+extern G_GNUC_INTERNAL void dump_mhod_string (ArtworkDB_MhodHeaderString
*mhod);
extern G_GNUC_INTERNAL void dump_mhni (MhniHeader *mhni);
extern G_GNUC_INTERNAL void dump_mhod (ArtworkDB_MhodHeader *mhod);
extern G_GNUC_INTERNAL void dump_mhii (MhiiHeader *mhii);
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
