Author: draenog Date: Wed Dec 29 14:45:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - implement debugging output in audtag without linking to core's cfg variable; taken from upstream
---- Files affected: packages/audacious: audacious-debug_audtag.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/audacious/audacious-debug_audtag.patch diff -u /dev/null packages/audacious/audacious-debug_audtag.patch:1.1 --- /dev/null Wed Dec 29 15:45:37 2010 +++ packages/audacious/audacious-debug_audtag.patch Wed Dec 29 15:45:32 2010 @@ -0,0 +1,1032 @@ +changeset: 6382:af52da71e22f +user: John Lindgren <[email protected]> +date: Thu Dec 23 15:23:54 2010 -0500 +files: src/audacious/main.c src/libaudtag/aac/aac.c src/libaudtag/ape/ape.c src/libaudtag/audtag.c src/libaudtag/audtag.h src/libaudtag/id3/id3-common.c src/libaudtag/id3/id3v22.c src/libaudtag/id3/id3v24.c src/libaudtag/tag_module.c src/libaudtag/util.c src/libaudtag/util.h src/libaudtag/wma/guid.c src/libaudtag/wma/wma.c +description: +Implement debugging output in audtag without linking to core's cfg variable. + + +diff -r febc349a5705 -r af52da71e22f src/audacious/main.c +--- a/src/audacious/main.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/audacious/main.c Thu Dec 23 15:23:54 2010 -0500 +@@ -385,6 +385,7 @@ + gtk_rc_add_default_file(aud_paths[BMP_PATH_GTKRC_FILE]); + + parse_cmd_line_options(&argc, &argv); ++ tag_set_verbose (cfg.verbose); + + if (!gtk_init_check(&argc, &argv)) + { /* XXX */ +diff -r febc349a5705 -r af52da71e22f src/libaudtag/aac/aac.c +--- a/src/libaudtag/aac/aac.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/aac/aac.c Thu Dec 23 15:23:54 2010 -0500 +@@ -79,8 +79,8 @@ + + void printAtom(Atom * atom) + { +- AUDDBG("size = %x\n", atom->size); +- AUDDBG("name = %s\n", atom->name); ++ TAGDBG("size = %x\n", atom->size); ++ TAGDBG("name = %s\n", atom->name); + } + + StrDataAtom *readStrDataAtom(VFSFile * fd) +@@ -119,7 +119,7 @@ + if (vfs_feof(fd)) + { + g_free(atom); +- AUDDBG("The atom %s could not be found\n", name); ++ TAGDBG("The atom %s could not be found\n", name); + return NULL; + } + return atom; +@@ -140,7 +140,7 @@ + vfs_fseek(fd, -(meta->size - 11), SEEK_CUR); + Atom *ilst = findAtom(fd, ILST); + +- AUDDBG("zzz = %d\n", vfs_ftell(fd)); ++ TAGDBG("zzz = %d\n", vfs_ftell(fd)); + ilstFileOffset = vfs_ftell(fd) - ilst->size; + vfs_fseek(fd, -(ilst->size - 7), SEEK_CUR); + +@@ -191,7 +191,7 @@ + g_free(atom); + if (vfs_feof(from)) + { +- AUDDBG("No free atoms\n"); ++ TAGDBG("No free atoms\n"); + g_free(atom); + atom = NULL; + } +diff -r febc349a5705 -r af52da71e22f src/libaudtag/ape/ape.c +--- a/src/libaudtag/ape/ape.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/ape/ape.c Thu Dec 23 15:23:54 2010 -0500 +@@ -84,7 +84,7 @@ + + if (ape_read_header (handle, header)) + { +- AUDDBG ("Found header at 0, length = %d, version = %d.\n", (gint) ++ TAGDBG ("Found header at 0, length = %d, version = %d.\n", (gint) + header->length, (gint) header->version); + * start = 0; + * length = header->length; +@@ -94,7 +94,7 @@ + if (! (header->flags & APE_FLAG_HAS_HEADER) || ! (header->flags & + APE_FLAG_IS_HEADER)) + { +- AUDDBG ("Invalid header flags (%u).\n", (guint) header->flags); ++ TAGDBG ("Invalid header flags (%u).\n", (guint) header->flags); + return FALSE; + } + +@@ -105,7 +105,7 @@ + + if (! ape_read_header (handle, & secondary)) + { +- AUDDBG ("Expected footer, but found none.\n"); ++ TAGDBG ("Expected footer, but found none.\n"); + return FALSE; + } + +@@ -120,7 +120,7 @@ + + if (ape_read_header (handle, header)) + { +- AUDDBG ("Found footer at %d, length = %d, version = %d.\n", (gint) ++ TAGDBG ("Found footer at %d, length = %d, version = %d.\n", (gint) + vfs_ftell (handle) - (gint) sizeof (APEHeader), (gint) header->length, + (gint) header->version); + * start = vfs_ftell (handle) - header->length; +@@ -131,7 +131,7 @@ + if ((header->flags & APE_FLAG_HAS_NO_FOOTER) || (header->flags & + APE_FLAG_IS_HEADER)) + { +- AUDDBG ("Invalid footer flags (%u).\n", (guint) header->flags); ++ TAGDBG ("Invalid footer flags (%u).\n", (guint) header->flags); + return FALSE; + } + +@@ -143,7 +143,7 @@ + + if (! ape_read_header (handle, & secondary)) + { +- AUDDBG ("Expected header, but found none.\n"); ++ TAGDBG ("Expected header, but found none.\n"); + return FALSE; + } + +@@ -154,7 +154,7 @@ + return TRUE; + } + +- AUDDBG ("No header found.\n"); ++ TAGDBG ("No header found.\n"); + return FALSE; + } + +@@ -175,7 +175,7 @@ + + if (length < 8) + { +- AUDDBG ("Expected item, but only %d bytes remain in tag.\n", length); ++ TAGDBG ("Expected item, but only %d bytes remain in tag.\n", length); + return NULL; + } + +@@ -183,7 +183,7 @@ + + if (value == NULL) + { +- AUDDBG ("Unterminated item key (max length = %d).\n", length - 8); ++ TAGDBG ("Unterminated item key (max length = %d).\n", length - 8); + return NULL; + } + +@@ -191,7 +191,7 @@ + + if (header[0] > (gchar *) (* data) + length - value) + { +- AUDDBG ("Item value of length %d, but only %d bytes remain in tag.\n", ++ TAGDBG ("Item value of length %d, but only %d bytes remain in tag.\n", + (gint) header[0], (gint) ((gchar *) (* data) + length - value)); + return NULL; + } +@@ -227,7 +227,7 @@ + return NULL; + } + +- AUDDBG ("Reading %d items:\n", header.items); ++ TAGDBG ("Reading %d items:\n", header.items); + item = data; + + while (header.items --) +@@ -238,7 +238,7 @@ + if (pair == NULL) + break; + +- AUDDBG ("Read: %s = %s.\n", pair->key, pair->value); ++ TAGDBG ("Read: %s = %s.\n", pair->key, pair->value); + list = g_list_prepend (list, pair); + } + +@@ -354,7 +354,7 @@ + gint value_len = strlen (value); + guint32 header[2]; + +- AUDDBG ("Write: %s = %s.\n", key, value); ++ TAGDBG ("Write: %s = %s.\n", key, value); + + header[0] = GUINT32_TO_LE (value_len); + header[1] = 0; +@@ -433,7 +433,7 @@ + { + if (start + length != vfs_fsize (handle)) + { +- AUDDBG ("Writing tags is only supported at end of file.\n"); ++ TAGDBG ("Writing tags is only supported at end of file.\n"); + goto ERROR; + } + +@@ -481,7 +481,7 @@ + items ++; + } + +- AUDDBG ("Wrote %d items, %d bytes.\n", items, length); ++ TAGDBG ("Wrote %d items, %d bytes.\n", items, length); + + if (! write_header (length, items, FALSE, handle) || vfs_fseek (handle, + start, SEEK_SET) || ! write_header (length, items, TRUE, handle)) +diff -r febc349a5705 -r af52da71e22f src/libaudtag/audtag.c +--- a/src/libaudtag/audtag.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/audtag.c Thu Dec 23 15:23:54 2010 -0500 +@@ -23,11 +23,18 @@ + #include "tag_module.h" + #include "util.h" + ++gboolean tag_verbose = FALSE; ++ + void tag_init(void) + { + init_tag_modules(); + } + ++void tag_set_verbose (gboolean verbose) ++{ ++ tag_verbose = verbose; ++} ++ + /* The tuple's file-related attributes are already set */ + + gboolean tag_tuple_read (Tuple * tuple, VFSFile * handle) +diff -r febc349a5705 -r af52da71e22f src/libaudtag/audtag.h +--- a/src/libaudtag/audtag.h Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/audtag.h Thu Dec 23 15:23:54 2010 -0500 +@@ -37,8 +37,8 @@ + TAG_TYPE_APE, + }; + +-void tag_init(void); +-void tag_terminate(void); ++void tag_init (void); ++void tag_set_verbose (gboolean verbose); + + gboolean tag_tuple_read (Tuple * tuple, VFSFile *fd); + gboolean tag_image_read (VFSFile * handle, void * * data, gint * size); +diff -r febc349a5705 -r af52da71e22f src/libaudtag/id3/id3-common.c +--- a/src/libaudtag/id3/id3-common.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/id3/id3-common.c Thu Dec 23 15:23:54 2010 -0500 +@@ -34,7 +34,7 @@ + gchar * buffer = NULL; + gsize converted = 0; + +- AUDDBG ("length = %d, encoding = %d, nulled = %d\n", length, encoding, ++ TAGDBG ("length = %d, encoding = %d, nulled = %d\n", length, encoding, + nulled); + + if (nulled) +@@ -50,7 +50,7 @@ + return NULL; + + length = null - text; +- AUDDBG ("length before null = %d\n", length); ++ TAGDBG ("length before null = %d\n", length); + + if (after != NULL) + * after = null + 1; +@@ -62,7 +62,7 @@ + return NULL; + + length = null - text; +- AUDDBG ("length before null = %d\n", length); ++ TAGDBG ("length before null = %d\n", length); + + if (after != NULL) + * after = null + 2; +@@ -92,8 +92,8 @@ + break; + } + +- AUDDBG ("length converted: %d\n", (gint) converted); +- AUDDBG ("string: %s\n", buffer); ++ TAGDBG ("length converted: %d\n", (gint) converted); ++ TAGDBG ("string: %s\n", buffer); + + if (_converted != NULL) + * _converted = converted; +diff -r febc349a5705 -r af52da71e22f src/libaudtag/id3/id3v22.c +--- a/src/libaudtag/id3/id3v22.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/id3/id3v22.c Thu Dec 23 15:23:54 2010 -0500 +@@ -97,12 +97,12 @@ + + header->size = unsyncsafe32(GUINT32_FROM_BE(header->size)); + +- AUDDBG ("Found ID3v2 header:\n"); +- AUDDBG (" magic = %.3s\n", header->magic); +- AUDDBG (" version = %d\n", (gint) header->version); +- AUDDBG (" revision = %d\n", (gint) header->revision); +- AUDDBG (" flags = %x\n", (gint) header->flags); +- AUDDBG (" size = %d\n", (gint) header->size); ++ TAGDBG ("Found ID3v2 header:\n"); ++ TAGDBG (" magic = %.3s\n", header->magic); ++ TAGDBG (" version = %d\n", (gint) header->version); ++ TAGDBG (" revision = %d\n", (gint) header->revision); ++ TAGDBG (" flags = %x\n", (gint) header->flags); ++ TAGDBG (" size = %d\n", (gint) header->size); + return TRUE; + } + +@@ -128,7 +128,7 @@ + + * syncsafe = (header.flags & ID3_HEADER_SYNCSAFE) ? TRUE : FALSE; + +- AUDDBG ("Offset = %d, header size = %d, data size = %d\n", ++ TAGDBG ("Offset = %d, header size = %d, data size = %d\n", + (gint) * offset, * header_size, * data_size); + + return TRUE; +@@ -154,16 +154,16 @@ + for (i = 0; i < 3; i++) + { + hdrsz |= (guint32) header.size[i] << ((2 - i) * 8); +- AUDDBG("header.size[%d] = %d hdrsz %d slot %d\n", i, header.size[i], hdrsz, 2 - i); ++ TAGDBG("header.size[%d] = %d hdrsz %d slot %d\n", i, header.size[i], hdrsz, 2 - i); + } + + // hdrsz = GUINT32_TO_BE(hdrsz); + if (hdrsz > max_size || hdrsz == 0) + return FALSE; + +- AUDDBG ("Found frame:\n"); +- AUDDBG (" key = %.3s\n", header.key); +- AUDDBG (" size = %d\n", (gint) hdrsz); ++ TAGDBG ("Found frame:\n"); ++ TAGDBG (" key = %.3s\n", header.key); ++ TAGDBG (" size = %d\n", (gint) hdrsz); + + * frame_size = sizeof (ID3v2FrameHeader) + hdrsz; + sprintf (key, "%.3s", header.key); +@@ -174,7 +174,7 @@ + if (vfs_fread (* data, 1, * size, handle) != * size) + return FALSE; + +- AUDDBG ("Data size = %d.\n", * size); ++ TAGDBG ("Data size = %d.\n", * size); + return TRUE; + } + +@@ -226,9 +226,9 @@ + return; + + if (customfield != NULL) +- AUDDBG ("Custom field %s = %s.\n", customfield, text); ++ TAGDBG ("Custom field %s = %s.\n", customfield, text); + else +- AUDDBG ("Field %i = %s.\n", field, text); ++ TAGDBG ("Field %i = %s.\n", field, text); + + tuple_associate_string (tuple, field, customfield, text); + g_free (text); +@@ -243,9 +243,9 @@ + return; + + if (customfield != NULL) +- AUDDBG ("Custom field %s = %s.\n", customfield, text); ++ TAGDBG ("Custom field %s = %s.\n", customfield, text); + else +- AUDDBG ("Field %i = %s.\n", field, text); ++ TAGDBG ("Field %i = %s.\n", field, text); + + tuple_associate_int (tuple, field, customfield, atoi (text)); + g_free (text); +@@ -258,7 +258,7 @@ + if (! decode_comment_frame (data, size, & lang, & type, & value)) + return; + +- AUDDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value); ++ TAGDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value); + + if (! type[0]) /* blank type == actual comment */ + tuple_associate_string (tuple, FIELD_COMMENT, NULL, value); +@@ -281,7 +281,7 @@ + return; + + gchar * value = separator + 1; +- AUDDBG ("TXX: %s = %s.\n", text, value); ++ TAGDBG ("TXX: %s = %s.\n", text, value); + tuple_associate_string (tuple, -1, text, value); + + g_free (text); +@@ -307,7 +307,7 @@ + data += 4; + size -= 4; + +- AUDDBG ("RVA block: channel = %d, adjustment = %d/%d, peak bits = %d\n", ++ TAGDBG ("RVA block: channel = %d, adjustment = %d/%d, peak bits = %d\n", + * channel, * adjustment, * adjustment_unit, peak_bits); + + if (peak_bits > 0 && peak_bits < sizeof (gint) * 8) +@@ -327,7 +327,7 @@ + data += bytes; + size -= count; + +- AUDDBG ("RVA block: peak = %d/%d\n", * peak, * peak_unit); ++ TAGDBG ("RVA block: peak = %d/%d\n", * peak, * peak_unit); + } + else + { +@@ -350,7 +350,7 @@ + + domain = (const gchar *) data; + +- AUDDBG ("RVA domain: %s\n", domain); ++ TAGDBG ("RVA domain: %s\n", domain); + + size -= strlen (domain) + 1; + data += strlen (domain) + 1; +@@ -444,7 +444,7 @@ + & data_size)) + return FALSE; + +- AUDDBG("Reading tags from %i bytes of ID3 data in %s\n", data_size, handle->uri); ++ TAGDBG("Reading tags from %i bytes of ID3 data in %s\n", data_size, handle->uri); + + for (pos = 0; pos < data_size; ) + { +@@ -455,7 +455,7 @@ + if (! read_frame (handle, data_size - pos, version, syncsafe, + & frame_size, key, & data, & size)) + { +- AUDDBG("read_frame failed at pos %i\n", pos); ++ TAGDBG("read_frame failed at pos %i\n", pos); + break; + } + +@@ -507,7 +507,7 @@ + decode_rva (tuple, data, size); + break; + default: +- AUDDBG ("Ignoring unsupported ID3 frame %s.\n", key); ++ TAGDBG ("Ignoring unsupported ID3 frame %s.\n", key); + break; + } + +@@ -533,7 +533,7 @@ + * image_data = g_memdup (after, data + size - after); + * image_size = data + size - after; + +- AUDDBG ("PIC: mime = %s, type = %d, size = %d.\n", * mime, ++ TAGDBG ("PIC: mime = %s, type = %d, size = %d.\n", * mime, + * type, * image_size); + return TRUE; + } +diff -r febc349a5705 -r af52da71e22f src/libaudtag/id3/id3v24.c +--- a/src/libaudtag/id3/id3v24.c Thu Dec 23 14:26:42 2010 -0500 ++++ b/src/libaudtag/id3/id3v24.c Thu Dec 23 15:23:54 2010 -0500 +@@ -118,7 +118,7 @@ + + size = GUINT32_FROM_BE (size); + +- AUDDBG ("Found v2.3 extended header, size = %d.\n", (gint) size); ++ TAGDBG ("Found v2.3 extended header, size = %d.\n", (gint) size); + + if (vfs_fseek (handle, size, SEEK_CUR)) + return FALSE; +@@ -136,7 +136,7 @@ + + size = unsyncsafe32 (GUINT32_FROM_BE (size)); + +- AUDDBG ("Found v2.4 extended header, size = %d.\n", (gint) size); ++ TAGDBG ("Found v2.4 extended header, size = %d.\n", (gint) size); + + if (vfs_fseek (handle, size - 4, SEEK_CUR)) + return FALSE; +@@ -155,12 +155,12 @@ + + header->size = unsyncsafe32 (GUINT32_FROM_BE (header->size)); + +- AUDDBG ("Found ID3v2 %s:\n", is_footer ? "footer" : "header"); +- AUDDBG (" magic = %.3s\n", header->magic); +- AUDDBG (" version = %d\n", (gint) header->version); +- AUDDBG (" revision = %d\n", (gint) header->revision); +- AUDDBG (" flags = %x\n", (gint) header->flags); +- AUDDBG (" size = %d\n", (gint) header->size); ++ TAGDBG ("Found ID3v2 %s:\n", is_footer ? "footer" : "header"); ++ TAGDBG (" magic = %.3s\n", header->magic); ++ TAGDBG (" version = %d\n", (gint) header->version); ++ TAGDBG (" revision = %d\n", (gint) header->revision); ++ TAGDBG (" flags = %x\n", (gint) header->flags); ++ TAGDBG (" size = %d\n", (gint) header->size); + return TRUE; + } + +@@ -256,7 +256,7 @@ + * data_size -= extended_size; + } + +- AUDDBG ("Offset = %d, header size = %d, data size = %d, footer size = " ++ TAGDBG ("Offset = %d, header size = %d, data size = %d, footer size = " + "%d.\n", (gint) * offset, * header_size, * data_size, * footer_size); + + return TRUE; +@@ -303,17 +303,17 @@ + if (header.size > max_size || header.size == 0) + return FALSE; + +- AUDDBG ("Found frame:\n"); +- AUDDBG (" key = %.4s\n", header.key); +- AUDDBG (" size = %d\n", (gint) header.size); +- AUDDBG (" flags = %x\n", (gint) header.flags); ++ TAGDBG ("Found frame:\n"); ++ TAGDBG (" key = %.4s\n", header.key); ++ TAGDBG (" size = %d\n", (gint) header.size); ++ TAGDBG (" flags = %x\n", (gint) header.flags); + + * frame_size = sizeof (ID3v2FrameHeader) + header.size; + sprintf (key, "%.4s", header.key); + + if (header.flags & (ID3_FRAME_COMPRESSED | ID3_FRAME_ENCRYPTED)) + { +- AUDDBG ("Hit compressed/encrypted frame %s.\n", key); ++ TAGDBG ("Hit compressed/encrypted frame %s.\n", key); + return FALSE; + } + +@@ -334,7 +334,7 @@ + if (syncsafe || (header.flags & ID3_FRAME_SYNCSAFE)) + * size = unsyncsafe (* data, * size); + +- AUDDBG ("Data size = %d.\n", * size); ++ TAGDBG ("Data size = %d.\n", * size); + return TRUE; + } + +@@ -390,7 +390,7 @@ + + if (mowgli_dictionary_retrieve (dict, key) != NULL) + { +- AUDDBG ("Discarding duplicate frame %s.\n", key); ++ TAGDBG ("Discarding duplicate frame %s.\n", key); + g_free (data); + continue; + } +@@ -407,7 +407,7 @@ + static gboolean write_frame (VFSFile * handle, GenericFrame * frame, gint * + frame_size) + { +- AUDDBG ("Writing frame %s, size %d\n", frame->key, frame->size); ++ TAGDBG ("Writing frame %s, size %d\n", frame->key, frame->size); + + ID3v2FrameHeader header; + +@@ -447,7 +447,7 @@ + WriteState state = {fd, 0}; + mowgli_dictionary_foreach (dict, write_frame_cb, & state); + +- AUDDBG ("Total frame bytes written = %d.\n", state.written_size); ++ TAGDBG ("Total frame bytes written = %d.\n", state.written_size); + return state.written_size; + } + +@@ -488,9 +488,9 @@ + return; + + if (customfield != NULL) +- AUDDBG ("Custom field %s = %s.\n", customfield, text); ++ TAGDBG ("Custom field %s = %s.\n", customfield, text); + else +- AUDDBG ("Field %i = %s.\n", field, text); ++ TAGDBG ("Field %i = %s.\n", field, text); + + tuple_associate_string (tuple, field, customfield, text); + g_free (text); +@@ -505,9 +505,9 @@ + return; + + if (customfield != NULL) +- AUDDBG ("Custom field %s = %s.\n", customfield, text); ++ TAGDBG ("Custom field %s = %s.\n", customfield, text); + else +- AUDDBG ("Field %i = %s.\n", field, text); ++ TAGDBG ("Field %i = %s.\n", field, text); + + tuple_associate_int (tuple, field, customfield, atoi (text)); + g_free (text); +@@ -545,10 +545,10 @@ + if (!memcmp(value, SECONDARY_CLASS_GAMES_SONG, 16)) + tuple_associate_string (tuple, -1, "media-class", "Game Soundtrack"); + } else { +- AUDDBG("Unrecognised tag %s (Windows Media) ignored\n", text); ++ TAGDBG("Unrecognised tag %s (Windows Media) ignored\n", text); + } + } else { +- AUDDBG("Unable to decode private data, skipping: %s\n", text); ++ TAGDBG("Unable to decode private data, skipping: %s\n", text); + } + + DONE: +@@ -562,7 +562,7 @@ + if (! decode_comment_frame (data, size, & lang, & type, & value)) + return; + +- AUDDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value); <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
