]> git.pld-linux.org Git - packages/audacious.git/blame - audacious-debug_audtag.patch
projects / packages / audacious.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- up to 2.4.4
[packages/audacious.git] / audacious-debug_audtag.patch
CommitLineData
9680a7b3
KK		 1changeset: 6382:af52da71e22f
2user: John Lindgren <john.lindgren@tds.net>
3date: Thu Dec 23 15:23:54 2010 -0500
4files: 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
5description:
6Implement debugging output in audtag without linking to core's cfg variable.
7
8
9diff -r febc349a5705 -r af52da71e22f src/audacious/main.c
10--- a/src/audacious/main.c Thu Dec 23 14:26:42 2010 -0500
11+++ b/src/audacious/main.c Thu Dec 23 15:23:54 2010 -0500
12@@ -385,6 +385,7 @@
13 gtk_rc_add_default_file(aud_paths[BMP_PATH_GTKRC_FILE]);
14
15 parse_cmd_line_options(&argc, &argv);
16+ tag_set_verbose (cfg.verbose);
17
18 if (!gtk_init_check(&argc, &argv))
19 { /* XXX */
20diff -r febc349a5705 -r af52da71e22f src/libaudtag/aac/aac.c
21--- a/src/libaudtag/aac/aac.c Thu Dec 23 14:26:42 2010 -0500
22+++ b/src/libaudtag/aac/aac.c Thu Dec 23 15:23:54 2010 -0500
23@@ -79,8 +79,8 @@
24
25 void printAtom(Atom * atom)
26 {
27- AUDDBG("size = %x\n", atom->size);
28- AUDDBG("name = %s\n", atom->name);
29+ TAGDBG("size = %x\n", atom->size);
30+ TAGDBG("name = %s\n", atom->name);
31 }
32
33 StrDataAtom *readStrDataAtom(VFSFile * fd)
34@@ -119,7 +119,7 @@
35 if (vfs_feof(fd))
36 {
37 g_free(atom);
38- AUDDBG("The atom %s could not be found\n", name);
39+ TAGDBG("The atom %s could not be found\n", name);
40 return NULL;
41 }
42 return atom;
43@@ -140,7 +140,7 @@
44 vfs_fseek(fd, -(meta->size - 11), SEEK_CUR);
45 Atom *ilst = findAtom(fd, ILST);
46
47- AUDDBG("zzz = %d\n", vfs_ftell(fd));
48+ TAGDBG("zzz = %d\n", vfs_ftell(fd));
49 ilstFileOffset = vfs_ftell(fd) - ilst->size;
50 vfs_fseek(fd, -(ilst->size - 7), SEEK_CUR);
51
52@@ -191,7 +191,7 @@
53 g_free(atom);
54 if (vfs_feof(from))
55 {
56- AUDDBG("No free atoms\n");
57+ TAGDBG("No free atoms\n");
58 g_free(atom);
59 atom = NULL;
60 }
61diff -r febc349a5705 -r af52da71e22f src/libaudtag/ape/ape.c
62--- a/src/libaudtag/ape/ape.c Thu Dec 23 14:26:42 2010 -0500
63+++ b/src/libaudtag/ape/ape.c Thu Dec 23 15:23:54 2010 -0500
64@@ -84,7 +84,7 @@
65
66 if (ape_read_header (handle, header))
67 {
68- AUDDBG ("Found header at 0, length = %d, version = %d.\n", (gint)
69+ TAGDBG ("Found header at 0, length = %d, version = %d.\n", (gint)
70 header->length, (gint) header->version);
71 * start = 0;
72 * length = header->length;
73@@ -94,7 +94,7 @@
74 if (! (header->flags & APE_FLAG_HAS_HEADER) || ! (header->flags &
75 APE_FLAG_IS_HEADER))
76 {
77- AUDDBG ("Invalid header flags (%u).\n", (guint) header->flags);
78+ TAGDBG ("Invalid header flags (%u).\n", (guint) header->flags);
79 return FALSE;
80 }
81
82@@ -105,7 +105,7 @@
83
84 if (! ape_read_header (handle, & secondary))
85 {
86- AUDDBG ("Expected footer, but found none.\n");
87+ TAGDBG ("Expected footer, but found none.\n");
88 return FALSE;
89 }
90
91@@ -120,7 +120,7 @@
92
93 if (ape_read_header (handle, header))
94 {
95- AUDDBG ("Found footer at %d, length = %d, version = %d.\n", (gint)
96+ TAGDBG ("Found footer at %d, length = %d, version = %d.\n", (gint)
97 vfs_ftell (handle) - (gint) sizeof (APEHeader), (gint) header->length,
98 (gint) header->version);
99 * start = vfs_ftell (handle) - header->length;
100@@ -131,7 +131,7 @@
101 if ((header->flags & APE_FLAG_HAS_NO_FOOTER) || (header->flags &
102 APE_FLAG_IS_HEADER))
103 {
104- AUDDBG ("Invalid footer flags (%u).\n", (guint) header->flags);
105+ TAGDBG ("Invalid footer flags (%u).\n", (guint) header->flags);
106 return FALSE;
107 }
108
109@@ -143,7 +143,7 @@
110
111 if (! ape_read_header (handle, & secondary))
112 {
113- AUDDBG ("Expected header, but found none.\n");
114+ TAGDBG ("Expected header, but found none.\n");
115 return FALSE;
116 }
117
118@@ -154,7 +154,7 @@
119 return TRUE;
120 }
121
122- AUDDBG ("No header found.\n");
123+ TAGDBG ("No header found.\n");
124 return FALSE;
125 }
126
127@@ -175,7 +175,7 @@
128
129 if (length < 8)
130 {
131- AUDDBG ("Expected item, but only %d bytes remain in tag.\n", length);
132+ TAGDBG ("Expected item, but only %d bytes remain in tag.\n", length);
133 return NULL;
134 }
135
136@@ -183,7 +183,7 @@
137
138 if (value == NULL)
139 {
140- AUDDBG ("Unterminated item key (max length = %d).\n", length - 8);
141+ TAGDBG ("Unterminated item key (max length = %d).\n", length - 8);
142 return NULL;
143 }
144
145@@ -191,7 +191,7 @@
146
147 if (header[0] > (gchar *) (* data) + length - value)
148 {
149- AUDDBG ("Item value of length %d, but only %d bytes remain in tag.\n",
150+ TAGDBG ("Item value of length %d, but only %d bytes remain in tag.\n",
151 (gint) header[0], (gint) ((gchar *) (* data) + length - value));
152 return NULL;
153 }
154@@ -227,7 +227,7 @@
155 return NULL;
156 }
157
158- AUDDBG ("Reading %d items:\n", header.items);
159+ TAGDBG ("Reading %d items:\n", header.items);
160 item = data;
161
162 while (header.items --)
163@@ -238,7 +238,7 @@
164 if (pair == NULL)
165 break;
166
167- AUDDBG ("Read: %s = %s.\n", pair->key, pair->value);
168+ TAGDBG ("Read: %s = %s.\n", pair->key, pair->value);
169 list = g_list_prepend (list, pair);
170 }
171
172@@ -354,7 +354,7 @@
173 gint value_len = strlen (value);
174 guint32 header[2];
175
176- AUDDBG ("Write: %s = %s.\n", key, value);
177+ TAGDBG ("Write: %s = %s.\n", key, value);
178
179 header[0] = GUINT32_TO_LE (value_len);
180 header[1] = 0;
181@@ -433,7 +433,7 @@
182 {
183 if (start + length != vfs_fsize (handle))
184 {
185- AUDDBG ("Writing tags is only supported at end of file.\n");
186+ TAGDBG ("Writing tags is only supported at end of file.\n");
187 goto ERROR;
188 }
189
190@@ -481,7 +481,7 @@
191 items ++;
192 }
193
194- AUDDBG ("Wrote %d items, %d bytes.\n", items, length);
195+ TAGDBG ("Wrote %d items, %d bytes.\n", items, length);
196
197 if (! write_header (length, items, FALSE, handle) || vfs_fseek (handle,
198 start, SEEK_SET) || ! write_header (length, items, TRUE, handle))
199diff -r febc349a5705 -r af52da71e22f src/libaudtag/audtag.c
200--- a/src/libaudtag/audtag.c Thu Dec 23 14:26:42 2010 -0500
201+++ b/src/libaudtag/audtag.c Thu Dec 23 15:23:54 2010 -0500
202@@ -23,11 +23,18 @@
203 #include "tag_module.h"
204 #include "util.h"
205
206+gboolean tag_verbose = FALSE;
207+
208 void tag_init(void)
209 {
210 init_tag_modules();
211 }
212
213+void tag_set_verbose (gboolean verbose)
214+{
215+ tag_verbose = verbose;
216+}
217+
218 /* The tuple's file-related attributes are already set */
219
220 gboolean tag_tuple_read (Tuple * tuple, VFSFile * handle)
221diff -r febc349a5705 -r af52da71e22f src/libaudtag/audtag.h
222--- a/src/libaudtag/audtag.h Thu Dec 23 14:26:42 2010 -0500
223+++ b/src/libaudtag/audtag.h Thu Dec 23 15:23:54 2010 -0500
224@@ -37,8 +37,8 @@
225 TAG_TYPE_APE,
226 };
227
228-void tag_init(void);
229-void tag_terminate(void);
230+void tag_init (void);
231+void tag_set_verbose (gboolean verbose);
232
233 gboolean tag_tuple_read (Tuple * tuple, VFSFile *fd);
234 gboolean tag_image_read (VFSFile * handle, void * * data, gint * size);
235diff -r febc349a5705 -r af52da71e22f src/libaudtag/id3/id3-common.c
236--- a/src/libaudtag/id3/id3-common.c Thu Dec 23 14:26:42 2010 -0500
237+++ b/src/libaudtag/id3/id3-common.c Thu Dec 23 15:23:54 2010 -0500
238@@ -34,7 +34,7 @@
239 gchar * buffer = NULL;
240 gsize converted = 0;
241
242- AUDDBG ("length = %d, encoding = %d, nulled = %d\n", length, encoding,
243+ TAGDBG ("length = %d, encoding = %d, nulled = %d\n", length, encoding,
244 nulled);
245
246 if (nulled)
247@@ -50,7 +50,7 @@
248 return NULL;
249
250 length = null - text;
251- AUDDBG ("length before null = %d\n", length);
252+ TAGDBG ("length before null = %d\n", length);
253
254 if (after != NULL)
255 * after = null + 1;
256@@ -62,7 +62,7 @@
257 return NULL;
258
259 length = null - text;
260- AUDDBG ("length before null = %d\n", length);
261+ TAGDBG ("length before null = %d\n", length);
262
263 if (after != NULL)
264 * after = null + 2;
265@@ -92,8 +92,8 @@
266 break;
267 }
268
269- AUDDBG ("length converted: %d\n", (gint) converted);
270- AUDDBG ("string: %s\n", buffer);
271+ TAGDBG ("length converted: %d\n", (gint) converted);
272+ TAGDBG ("string: %s\n", buffer);
273
274 if (_converted != NULL)
275 * _converted = converted;
276diff -r febc349a5705 -r af52da71e22f src/libaudtag/id3/id3v22.c
277--- a/src/libaudtag/id3/id3v22.c Thu Dec 23 14:26:42 2010 -0500
278+++ b/src/libaudtag/id3/id3v22.c Thu Dec 23 15:23:54 2010 -0500
279@@ -97,12 +97,12 @@
280
281 header->size = unsyncsafe32(GUINT32_FROM_BE(header->size));
282
283- AUDDBG ("Found ID3v2 header:\n");
284- AUDDBG (" magic = %.3s\n", header->magic);
285- AUDDBG (" version = %d\n", (gint) header->version);
286- AUDDBG (" revision = %d\n", (gint) header->revision);
287- AUDDBG (" flags = %x\n", (gint) header->flags);
288- AUDDBG (" size = %d\n", (gint) header->size);
289+ TAGDBG ("Found ID3v2 header:\n");
290+ TAGDBG (" magic = %.3s\n", header->magic);
291+ TAGDBG (" version = %d\n", (gint) header->version);
292+ TAGDBG (" revision = %d\n", (gint) header->revision);
293+ TAGDBG (" flags = %x\n", (gint) header->flags);
294+ TAGDBG (" size = %d\n", (gint) header->size);
295 return TRUE;
296 }
297
298@@ -128,7 +128,7 @@
299
300 * syncsafe = (header.flags & ID3_HEADER_SYNCSAFE) ? TRUE : FALSE;
301
302- AUDDBG ("Offset = %d, header size = %d, data size = %d\n",
303+ TAGDBG ("Offset = %d, header size = %d, data size = %d\n",
304 (gint) * offset, * header_size, * data_size);
305
306 return TRUE;
307@@ -154,16 +154,16 @@
308 for (i = 0; i < 3; i++)
309 {
310 hdrsz |= (guint32) header.size[i] << ((2 - i) * 8);
311- AUDDBG("header.size[%d] = %d hdrsz %d slot %d\n", i, header.size[i], hdrsz, 2 - i);
312+ TAGDBG("header.size[%d] = %d hdrsz %d slot %d\n", i, header.size[i], hdrsz, 2 - i);
313 }
314
315 // hdrsz = GUINT32_TO_BE(hdrsz);
316 if (hdrsz > max_size || hdrsz == 0)
317 return FALSE;
318
319- AUDDBG ("Found frame:\n");
320- AUDDBG (" key = %.3s\n", header.key);
321- AUDDBG (" size = %d\n", (gint) hdrsz);
322+ TAGDBG ("Found frame:\n");
323+ TAGDBG (" key = %.3s\n", header.key);
324+ TAGDBG (" size = %d\n", (gint) hdrsz);
325
326 * frame_size = sizeof (ID3v2FrameHeader) + hdrsz;
327 sprintf (key, "%.3s", header.key);
328@@ -174,7 +174,7 @@
329 if (vfs_fread (* data, 1, * size, handle) != * size)
330 return FALSE;
331
332- AUDDBG ("Data size = %d.\n", * size);
333+ TAGDBG ("Data size = %d.\n", * size);
334 return TRUE;
335 }
336
337@@ -226,9 +226,9 @@
338 return;
339
340 if (customfield != NULL)
341- AUDDBG ("Custom field %s = %s.\n", customfield, text);
342+ TAGDBG ("Custom field %s = %s.\n", customfield, text);
343 else
344- AUDDBG ("Field %i = %s.\n", field, text);
345+ TAGDBG ("Field %i = %s.\n", field, text);
346
347 tuple_associate_string (tuple, field, customfield, text);
348 g_free (text);
349@@ -243,9 +243,9 @@
350 return;
351
352 if (customfield != NULL)
353- AUDDBG ("Custom field %s = %s.\n", customfield, text);
354+ TAGDBG ("Custom field %s = %s.\n", customfield, text);
355 else
356- AUDDBG ("Field %i = %s.\n", field, text);
357+ TAGDBG ("Field %i = %s.\n", field, text);
358
359 tuple_associate_int (tuple, field, customfield, atoi (text));
360 g_free (text);
361@@ -258,7 +258,7 @@
362 if (! decode_comment_frame (data, size, & lang, & type, & value))
363 return;
364
365- AUDDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value);
366+ TAGDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value);
367
368 if (! type[0]) /* blank type == actual comment */
369 tuple_associate_string (tuple, FIELD_COMMENT, NULL, value);
370@@ -281,7 +281,7 @@
371 return;
372
373 gchar * value = separator + 1;
374- AUDDBG ("TXX: %s = %s.\n", text, value);
375+ TAGDBG ("TXX: %s = %s.\n", text, value);
376 tuple_associate_string (tuple, -1, text, value);
377
378 g_free (text);
379@@ -307,7 +307,7 @@
380 data += 4;
381 size -= 4;
382
383- AUDDBG ("RVA block: channel = %d, adjustment = %d/%d, peak bits = %d\n",
384+ TAGDBG ("RVA block: channel = %d, adjustment = %d/%d, peak bits = %d\n",
385 * channel, * adjustment, * adjustment_unit, peak_bits);
386
387 if (peak_bits > 0 && peak_bits < sizeof (gint) * 8)
388@@ -327,7 +327,7 @@
389 data += bytes;
390 size -= count;
391
392- AUDDBG ("RVA block: peak = %d/%d\n", * peak, * peak_unit);
393+ TAGDBG ("RVA block: peak = %d/%d\n", * peak, * peak_unit);
394 }
395 else
396 {
397@@ -350,7 +350,7 @@
398
399 domain = (const gchar *) data;
400
401- AUDDBG ("RVA domain: %s\n", domain);
402+ TAGDBG ("RVA domain: %s\n", domain);
403
404 size -= strlen (domain) + 1;
405 data += strlen (domain) + 1;
406@@ -444,7 +444,7 @@
407 & data_size))
408 return FALSE;
409
410- AUDDBG("Reading tags from %i bytes of ID3 data in %s\n", data_size, handle->uri);
411+ TAGDBG("Reading tags from %i bytes of ID3 data in %s\n", data_size, handle->uri);
412
413 for (pos = 0; pos < data_size; )
414 {
415@@ -455,7 +455,7 @@
416 if (! read_frame (handle, data_size - pos, version, syncsafe,
417 & frame_size, key, & data, & size))
418 {
419- AUDDBG("read_frame failed at pos %i\n", pos);
420+ TAGDBG("read_frame failed at pos %i\n", pos);
421 break;
422 }
423
424@@ -507,7 +507,7 @@
425 decode_rva (tuple, data, size);
426 break;
427 default:
428- AUDDBG ("Ignoring unsupported ID3 frame %s.\n", key);
429+ TAGDBG ("Ignoring unsupported ID3 frame %s.\n", key);
430 break;
431 }
432
433@@ -533,7 +533,7 @@
434 * image_data = g_memdup (after, data + size - after);
435 * image_size = data + size - after;
436
437- AUDDBG ("PIC: mime = %s, type = %d, size = %d.\n", * mime,
438+ TAGDBG ("PIC: mime = %s, type = %d, size = %d.\n", * mime,
439 * type, * image_size);
440 return TRUE;
441 }
442diff -r febc349a5705 -r af52da71e22f src/libaudtag/id3/id3v24.c
443--- a/src/libaudtag/id3/id3v24.c Thu Dec 23 14:26:42 2010 -0500
444+++ b/src/libaudtag/id3/id3v24.c Thu Dec 23 15:23:54 2010 -0500
445@@ -118,7 +118,7 @@
446
447 size = GUINT32_FROM_BE (size);
448
449- AUDDBG ("Found v2.3 extended header, size = %d.\n", (gint) size);
450+ TAGDBG ("Found v2.3 extended header, size = %d.\n", (gint) size);
451
452 if (vfs_fseek (handle, size, SEEK_CUR))
453 return FALSE;
454@@ -136,7 +136,7 @@
455
456 size = unsyncsafe32 (GUINT32_FROM_BE (size));
457
458- AUDDBG ("Found v2.4 extended header, size = %d.\n", (gint) size);
459+ TAGDBG ("Found v2.4 extended header, size = %d.\n", (gint) size);
460
461 if (vfs_fseek (handle, size - 4, SEEK_CUR))
462 return FALSE;
463@@ -155,12 +155,12 @@
464
465 header->size = unsyncsafe32 (GUINT32_FROM_BE (header->size));
466
467- AUDDBG ("Found ID3v2 %s:\n", is_footer ? "footer" : "header");
468- AUDDBG (" magic = %.3s\n", header->magic);
469- AUDDBG (" version = %d\n", (gint) header->version);
470- AUDDBG (" revision = %d\n", (gint) header->revision);
471- AUDDBG (" flags = %x\n", (gint) header->flags);
472- AUDDBG (" size = %d\n", (gint) header->size);
473+ TAGDBG ("Found ID3v2 %s:\n", is_footer ? "footer" : "header");
474+ TAGDBG (" magic = %.3s\n", header->magic);
475+ TAGDBG (" version = %d\n", (gint) header->version);
476+ TAGDBG (" revision = %d\n", (gint) header->revision);
477+ TAGDBG (" flags = %x\n", (gint) header->flags);
478+ TAGDBG (" size = %d\n", (gint) header->size);
479 return TRUE;
480 }
481
482@@ -256,7 +256,7 @@
483 * data_size -= extended_size;
484 }
485
486- AUDDBG ("Offset = %d, header size = %d, data size = %d, footer size = "
487+ TAGDBG ("Offset = %d, header size = %d, data size = %d, footer size = "
488 "%d.\n", (gint) * offset, * header_size, * data_size, * footer_size);
489
490 return TRUE;
491@@ -303,17 +303,17 @@
492 if (header.size > max_size || header.size == 0)
493 return FALSE;
494
495- AUDDBG ("Found frame:\n");
496- AUDDBG (" key = %.4s\n", header.key);
497- AUDDBG (" size = %d\n", (gint) header.size);
498- AUDDBG (" flags = %x\n", (gint) header.flags);
499+ TAGDBG ("Found frame:\n");
500+ TAGDBG (" key = %.4s\n", header.key);
501+ TAGDBG (" size = %d\n", (gint) header.size);
502+ TAGDBG (" flags = %x\n", (gint) header.flags);
503
504 * frame_size = sizeof (ID3v2FrameHeader) + header.size;
505 sprintf (key, "%.4s", header.key);
506
507 if (header.flags & (ID3_FRAME_COMPRESSED | ID3_FRAME_ENCRYPTED))
508 {
509- AUDDBG ("Hit compressed/encrypted frame %s.\n", key);
510+ TAGDBG ("Hit compressed/encrypted frame %s.\n", key);
511 return FALSE;
512 }
513
514@@ -334,7 +334,7 @@
515 if (syncsafe || (header.flags & ID3_FRAME_SYNCSAFE))
516 * size = unsyncsafe (* data, * size);
517
518- AUDDBG ("Data size = %d.\n", * size);
519+ TAGDBG ("Data size = %d.\n", * size);
520 return TRUE;
521 }
522
523@@ -390,7 +390,7 @@
524
525 if (mowgli_dictionary_retrieve (dict, key) != NULL)
526 {
527- AUDDBG ("Discarding duplicate frame %s.\n", key);
528+ TAGDBG ("Discarding duplicate frame %s.\n", key);
529 g_free (data);
530 continue;
531 }
532@@ -407,7 +407,7 @@
533 static gboolean write_frame (VFSFile * handle, GenericFrame * frame, gint *
534 frame_size)
535 {
536- AUDDBG ("Writing frame %s, size %d\n", frame->key, frame->size);
537+ TAGDBG ("Writing frame %s, size %d\n", frame->key, frame->size);
538
539 ID3v2FrameHeader header;
540
541@@ -447,7 +447,7 @@
542 WriteState state = {fd, 0};
543 mowgli_dictionary_foreach (dict, write_frame_cb, & state);
544
545- AUDDBG ("Total frame bytes written = %d.\n", state.written_size);
546+ TAGDBG ("Total frame bytes written = %d.\n", state.written_size);
547 return state.written_size;
548 }
549
550@@ -488,9 +488,9 @@
551 return;
552
553 if (customfield != NULL)
554- AUDDBG ("Custom field %s = %s.\n", customfield, text);
555+ TAGDBG ("Custom field %s = %s.\n", customfield, text);
556 else
557- AUDDBG ("Field %i = %s.\n", field, text);
558+ TAGDBG ("Field %i = %s.\n", field, text);
559
560 tuple_associate_string (tuple, field, customfield, text);
561 g_free (text);
562@@ -505,9 +505,9 @@
563 return;
564
565 if (customfield != NULL)
566- AUDDBG ("Custom field %s = %s.\n", customfield, text);
567+ TAGDBG ("Custom field %s = %s.\n", customfield, text);
568 else
569- AUDDBG ("Field %i = %s.\n", field, text);
570+ TAGDBG ("Field %i = %s.\n", field, text);
571
572 tuple_associate_int (tuple, field, customfield, atoi (text));
573 g_free (text);
574@@ -545,10 +545,10 @@
575 if (!memcmp(value, SECONDARY_CLASS_GAMES_SONG, 16))
576 tuple_associate_string (tuple, -1, "media-class", "Game Soundtrack");
577 } else {
578- AUDDBG("Unrecognised tag %s (Windows Media) ignored\n", text);
579+ TAGDBG("Unrecognised tag %s (Windows Media) ignored\n", text);
580 }
581 } else {
582- AUDDBG("Unable to decode private data, skipping: %s\n", text);
583+ TAGDBG("Unable to decode private data, skipping: %s\n", text);
584 }
585
586 DONE:
587@@ -562,7 +562,7 @@
588 if (! decode_comment_frame (data, size, & lang, & type, & value))
589 return;
590
591- AUDDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value);
592+ TAGDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value);
593
594 if (! type[0]) /* blank type == actual comment */
595 tuple_associate_string (tuple, FIELD_COMMENT, NULL, value);
596@@ -585,7 +585,7 @@
597 return;
598
599 gchar * value = separator + 1;
600- AUDDBG ("TXXX: %s = %s.\n", text, value);
601+ TAGDBG ("TXXX: %s = %s.\n", text, value);
602 tuple_associate_string (tuple, -1, text, value);
603
604 g_free (text);
605@@ -611,7 +611,7 @@
606 data += 4;
607 size -= 4;
608
609- AUDDBG ("RVA2 block: channel = %d, adjustment = %d/%d, peak bits = %d\n",
610+ TAGDBG ("RVA2 block: channel = %d, adjustment = %d/%d, peak bits = %d\n",
611 * channel, * adjustment, * adjustment_unit, peak_bits);
612
613 if (peak_bits > 0 && peak_bits < sizeof (gint) * 8)
614@@ -631,7 +631,7 @@
615 data += bytes;
616 size -= count;
617
618- AUDDBG ("RVA2 block: peak = %d/%d\n", * peak, * peak_unit);
619+ TAGDBG ("RVA2 block: peak = %d/%d\n", * peak, * peak_unit);
620 }
621 else
622 {
623@@ -654,7 +654,7 @@
624
625 domain = (const gchar *) data;
626
627- AUDDBG ("RVA2 domain: %s\n", domain);
628+ TAGDBG ("RVA2 domain: %s\n", domain);
629
630 size -= strlen (domain) + 1;
631 data += strlen (domain) + 1;
632@@ -752,7 +752,7 @@
633 if (frame == NULL)
634 return;
635
636- AUDDBG ("Deleting frame %s.\n", id3_frames[id]);
637+ TAGDBG ("Deleting frame %s.\n", id3_frames[id]);
638 mowgli_dictionary_delete (dict, id3_frames[id]);
639 free_generic_frame (frame);
640 }
641@@ -766,7 +766,7 @@
642 return;
643 }
644
645- AUDDBG ("Adding text frame %s = %s.\n", id3_frames[id], text);
646+ TAGDBG ("Adding text frame %s = %s.\n", id3_frames[id], text);
647 gint length = strlen (text);
648
649 GenericFrame * frame = add_generic_frame (id, length + 1, dict);
650@@ -782,7 +782,7 @@
651 return;
652 }
653
654- AUDDBG ("Adding comment frame = %s.\n", text);
655+ TAGDBG ("Adding comment frame = %s.\n", text);
656 gint length = strlen (text);
657 GenericFrame * frame = add_generic_frame (ID3_COMMENT, length + 5, dict);
658
659@@ -896,7 +896,7 @@
660 decode_rva2 (tuple, data, size);
661 break;
662 default:
663- AUDDBG ("Ignoring unsupported ID3 frame %s.\n", key);
664+ TAGDBG ("Ignoring unsupported ID3 frame %s.\n", key);
665 break;
666 }
667
668@@ -925,7 +925,7 @@
669 * image_data = g_memdup (after, data + size - after);
670 * image_size = data + size - after;
671
672- AUDDBG ("APIC: mime = %s, type = %d, desc = %s, size = %d.\n", * mime,
673+ TAGDBG ("APIC: mime = %s, type = %d, desc = %s, size = %d.\n", * mime,
674 * type, * desc, * image_size);
675 return TRUE;
676 }
677diff -r febc349a5705 -r af52da71e22f src/libaudtag/tag_module.c
678--- a/src/libaudtag/tag_module.c Thu Dec 23 14:26:42 2010 -0500
679+++ b/src/libaudtag/tag_module.c Thu Dec 23 15:23:54 2010 -0500
680@@ -47,13 +47,13 @@
681 {
682 if (vfs_fseek(fd, 0, SEEK_SET))
683 {
684- AUDDBG("not a seekable file\n");
685+ TAGDBG("not a seekable file\n");
686 return NULL;
687 }
688
689 if (((tag_module_t *) mod->data)->can_handle_file (fd))
690 {
691- AUDDBG ("Module %s accepted file.\n", ((tag_module_t *)
692+ TAGDBG ("Module %s accepted file.\n", ((tag_module_t *)
693 mod->data)->name);
694 return mod->data;
695 }
696@@ -69,6 +69,6 @@
697 }
698 }
699
700- AUDDBG("no module found\n");
701+ TAGDBG("no module found\n");
702 return NULL;
703 }
704diff -r febc349a5705 -r af52da71e22f src/libaudtag/util.c
705--- a/src/libaudtag/util.c Thu Dec 23 14:26:42 2010 -0500
706+++ b/src/libaudtag/util.c Thu Dec 23 15:23:54 2010 -0500
707@@ -61,66 +61,66 @@
708 dir = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
709 file = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
710 filepath = g_strdup_printf("%s/%s", dir, file);
711- AUDDBG("file path = %s\n", filepath);
712+ TAGDBG("file path = %s\n", filepath);
713 return filepath;
714 }
715
716 void print_tuple(Tuple * tuple)
717 {
718 #if WMA_DEBUG
719- AUDDBG("--------------TUPLE PRINT --------------------\n");
720+ TAGDBG("--------------TUPLE PRINT --------------------\n");
721 const gchar *title = tuple_get_string(tuple, FIELD_TITLE, NULL);
722- AUDDBG("title = %s\n", title);
723+ TAGDBG("title = %s\n", title);
724 /* artist */
725 const gchar *artist = tuple_get_string(tuple, FIELD_ARTIST, NULL);
726- AUDDBG("artist = %s\n", artist);
727+ TAGDBG("artist = %s\n", artist);
728
729 /* copyright */
730 const gchar *copyright = tuple_get_string(tuple, FIELD_COPYRIGHT, NULL);
731- AUDDBG("copyright = %s\n", copyright);
732+ TAGDBG("copyright = %s\n", copyright);
733
734 /* comment / description */
735
736 const gchar *comment = tuple_get_string(tuple, FIELD_COMMENT, NULL);
737- AUDDBG("comment = %s\n", comment);
738+ TAGDBG("comment = %s\n", comment);
739
740 /* codec name */
741 const gchar *codec_name = tuple_get_string(tuple, FIELD_CODEC, NULL);
742- AUDDBG("codec = %s\n", codec_name);
743+ TAGDBG("codec = %s\n", codec_name);
744
745 /* album */
746 const gchar *album = tuple_get_string(tuple, FIELD_ALBUM, NULL);
747- AUDDBG("Album = %s\n", album);
748+ TAGDBG("Album = %s\n", album);
749
750 /*track number */
751 gint track_nr = tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL);
752- AUDDBG("Track nr = %d\n", track_nr);
753+ TAGDBG("Track nr = %d\n", track_nr);
754
755 /* genre */
756 const gchar *genre = tuple_get_string(tuple, FIELD_GENRE, NULL);
757- AUDDBG("Genre = %s \n", genre);
758+ TAGDBG("Genre = %s \n", genre);
759
760 /* length */
761 gint length = tuple_get_int(tuple, FIELD_LENGTH, NULL);
762- AUDDBG("Length = %d\n", length);
763+ TAGDBG("Length = %d\n", length);
764
765 /* year */
766 gint year = tuple_get_int(tuple, FIELD_YEAR, NULL);
767- AUDDBG("Year = %d\n", year);
768+ TAGDBG("Year = %d\n", year);
769
770 /* quality */
771 const gchar *quality = tuple_get_string(tuple, FIELD_QUALITY, NULL);
772- AUDDBG("quality = %s\n", quality);
773+ TAGDBG("quality = %s\n", quality);
774
775 /* path */
776 const gchar *path = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
777- AUDDBG("path = %s\n", path);
778+ TAGDBG("path = %s\n", path);
779
780 /* filename */
781 const gchar *filename = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
782- AUDDBG("filename = %s\n", filename);
783+ TAGDBG("filename = %s\n", filename);
784
785- AUDDBG("-----------------END---------------------\n");
786+ TAGDBG("-----------------END---------------------\n");
787 #endif
788 }
789
790@@ -151,7 +151,7 @@
791 p = NULL;
792 }
793 gchar *s = utf8(p);
794- AUDDBG("Converted to UTF8: '%s'\n", s);
795+ TAGDBG("Converted to UTF8: '%s'\n", s);
796 g_free(s);
797 return p;
798 }
799diff -r febc349a5705 -r af52da71e22f src/libaudtag/util.h
800--- a/src/libaudtag/util.h Thu Dec 23 14:26:42 2010 -0500
801+++ b/src/libaudtag/util.h Thu Dec 23 15:23:54 2010 -0500
802@@ -23,7 +23,7 @@
803 #define TAGUTIL_H
804
805 #include <glib.h>
806-#include <audacious/debug.h>
807+
808 #include "libaudcore/tuple.h"
809 #include "libaudcore/vfs.h"
810
811@@ -157,6 +157,10 @@
812 GENRE_EURO_HOUSE
813 };
814
815+extern gboolean tag_verbose;
816+
817+#define TAGDBG(...) do {if (tag_verbose) {printf ("%s:%d [%s]: ", __FILE__, __LINE__, __FUNCTION__); printf (__VA_ARGS__);}} while (0)
818+
819 time_t unix_time(guint64 win_time);
820
821 guint16 get_year(guint64 win_time);
822diff -r febc349a5705 -r af52da71e22f src/libaudtag/wma/guid.c
823--- a/src/libaudtag/wma/guid.c Thu Dec 23 14:26:42 2010 -0500
824+++ b/src/libaudtag/wma/guid.c Thu Dec 23 15:23:54 2010 -0500
825@@ -71,18 +71,18 @@
826 gboolean guid_equal(GUID_t * g1, GUID_t * g2)
827 {
828 /*
829- AUDDBG("GUID 1 = %8x-%hx-%hx-%"PRIx64"\n", g1->le32, g1->le16_1, g1->le16_2, g1->be64);
830- AUDDBG("GUID 2 = %8x-%hx-%hx-%"PRIx64"\n", g2->le32, g2->le16_1, g2->le16_2, g2->be64);
831+ TAGDBG("GUID 1 = %8x-%hx-%hx-%"PRIx64"\n", g1->le32, g1->le16_1, g1->le16_2, g1->be64);
832+ TAGDBG("GUID 2 = %8x-%hx-%hx-%"PRIx64"\n", g2->le32, g2->le16_1, g2->le16_2, g2->be64);
833 */
834
835 g_return_val_if_fail((g1 != NULL) && (g2 != NULL), FALSE);
836 if (!memcmp(g1, g2, 16))
837 {
838- // AUDDBG("equal\n");
839+ // TAGDBG("equal\n");
840
841 return TRUE;
842 }
843- /* AUDDBG("not equal\n"); */
844+ /* TAGDBG("not equal\n"); */
845 return FALSE;
846 }
847
848diff -r febc349a5705 -r af52da71e22f src/libaudtag/wma/wma.c
849--- a/src/libaudtag/wma/wma.c Thu Dec 23 14:26:42 2010 -0500
850+++ b/src/libaudtag/wma/wma.c Thu Dec 23 15:23:54 2010 -0500
851@@ -31,7 +31,7 @@
852 /* static functions */
853 static GenericHeader *read_generic_header(VFSFile * f, gboolean read_data)
854 {
855- AUDDBG("read top-level header object\n");
856+ TAGDBG("read top-level header object\n");
857 g_return_val_if_fail((f != NULL), NULL);
858 GenericHeader *header = g_new0(GenericHeader, 1);
859 header->guid = guid_read_from_file(f);
860@@ -42,7 +42,7 @@
861 header->data = NULL;
862
863 gchar *s = guid_convert_to_string(header->guid);
864- AUDDBG("read GUID: %s\n", s);
865+ TAGDBG("read GUID: %s\n", s);
866 g_free(s);
867
868 return header;
869@@ -50,7 +50,7 @@
870
871 static HeaderObj *read_top_header_object(VFSFile * f)
872 {
873- AUDDBG("read top-level header object\n");
874+ TAGDBG("read top-level header object\n");
875 g_return_val_if_fail((f != NULL), NULL);
876 HeaderObj *header = g_new0(HeaderObj, 1);
877
878@@ -59,7 +59,7 @@
879
880 header->size = read_LEuint64(f);
881 header->objectsNr = read_LEuint32(f);
882- AUDDBG("Number of child objects: %d\n", header->objectsNr);
883+ TAGDBG("Number of child objects: %d\n", header->objectsNr);
884
885 header->res1 = read_uint8(f);
886 header->res2 = read_uint8(f);
887@@ -102,14 +102,14 @@
888
889 static guint find_descriptor_id(gchar * s)
890 {
891- AUDDBG("finding descriptor id for '%s'\n", s);
892+ TAGDBG("finding descriptor id for '%s'\n", s);
893 g_return_val_if_fail(s != NULL, -1);
894 gchar *l[DESC_LAST] = { DESC_ALBUM_STR, DESC_YEAR_STR, DESC_GENRE_STR, DESC_TRACK_STR };
895 guint i;
896 for (i = 0; i < DESC_LAST; i++)
897 if (!strcmp(l[i], s))
898 {
899- AUDDBG("found descriptor %s\n", s);
900+ TAGDBG("found descriptor %s\n", s);
901 return i;
902 }
903 return -1;
904@@ -121,20 +121,20 @@
905 gchar *val = NULL, *name = NULL;
906 guint32 intval = -1;
907 gint dtype;
908- AUDDBG("reading name_len\n");
909+ TAGDBG("reading name_len\n");
910 cd->name_len = read_LEuint16(f);
911- AUDDBG("reading name\n");
912+ TAGDBG("reading name\n");
913 cd->name = fread_utf16(f, cd->name_len);
914- AUDDBG("reading val_type\n");
915+ TAGDBG("reading val_type\n");
916 cd->val_type = read_LEuint16(f);
917- AUDDBG("reading val_len\n");
918+ TAGDBG("reading val_len\n");
919 cd->val_len = read_LEuint16(f);
920
921 name = utf8(cd->name);
922 dtype = find_descriptor_id(name);
923 g_free(name);
924
925- AUDDBG("reading val\n");
926+ TAGDBG("reading val\n");
927
928 if (populate_tuple)
929 {
930@@ -143,7 +143,7 @@
931 { /*UTF16 */
932 cd->val = read_char_data(f, cd->val_len);
933 val = utf8((gunichar2 *) cd->val);
934- AUDDBG("val: '%s' dtype: %d\n", val, dtype);
935+ TAGDBG("val: '%s' dtype: %d\n", val, dtype);
936 if (dtype == DESC_ALBUM)
937 tuple_associate_string(t, FIELD_ALBUM, NULL, val);
938 if (dtype == DESC_GENRE)
939@@ -158,7 +158,7 @@
940 if (cd->val_type == 3)
941 {
942 intval = read_LEuint32(f);
943- AUDDBG("intval: %d, dtype: %d\n", intval, dtype);
944+ TAGDBG("intval: %d, dtype: %d\n", intval, dtype);
945 if (dtype == DESC_TRACK)
946 tuple_associate_int(t, FIELD_TRACK_NUMBER, NULL, intval);
947 }
948@@ -168,8 +168,8 @@
949 }
950 else
951 cd->val = read_char_data(f, cd->val_len);
952- AUDDBG("read str_val: '%s', intval: %d\n", val, intval);
953- AUDDBG("exiting read_descriptor \n\n");
954+ TAGDBG("read str_val: '%s', intval: %d\n", val, intval);
955+ TAGDBG("exiting read_descriptor \n\n");
956 return cd;
957 }
958
959@@ -214,7 +214,7 @@
960 /* returns the offset of the object in the file */
961 static long ftell_object_by_guid(VFSFile * f, GUID_t * g)
962 {
963- AUDDBG("seeking object %s, with ID %d \n", guid_convert_to_string(g), get_guid_type(g));
964+ TAGDBG("seeking object %s, with ID %d \n", guid_convert_to_string(g), get_guid_type(g));
965 HeaderObj *h = read_top_header_object(f);
966 g_return_val_if_fail((f != NULL) && (g != NULL) && (h != NULL), -1);
967
968@@ -222,19 +222,19 @@
969 while (i < h->objectsNr)
970 {
971 GenericHeader *gen_hdr = read_generic_header(f, FALSE);
972- AUDDBG("encountered GUID %s, with ID %d\n", guid_convert_to_string(gen_hdr->guid), get_guid_type(gen_hdr->guid));
973+ TAGDBG("encountered GUID %s, with ID %d\n", guid_convert_to_string(gen_hdr->guid), get_guid_type(gen_hdr->guid));
974 if (guid_equal(gen_hdr->guid, g))
975 {
976 g_free(h);
977 g_free(gen_hdr);
978 guint64 ret = vfs_ftell(f) - 24;
979- AUDDBG("at offset %" PRIx64 "\n", ret);
980+ TAGDBG("at offset %" PRIx64 "\n", ret);
981 return ret;
982 }
983 vfs_fseek(f, gen_hdr->size - 24, SEEK_CUR); //most headers have a size as their second field"
984 i++;
985 }
986- AUDDBG("The object was not found\n");
987+ TAGDBG("The object was not found\n");
988
989 return -1;
990 }
991@@ -298,7 +298,7 @@
992
993 static gboolean write_generic_header(VFSFile * f, GenericHeader * gh)
994 {
995- AUDDBG("Writing generic header\n");
996+ TAGDBG("Writing generic header\n");
997 guid_write_to_file(f, get_guid_type(gh->guid));
998 return write_char_data(f, gh->data, gh->size);
999 }
1000@@ -312,7 +312,7 @@
1001
1002 static gboolean write_top_header_object(VFSFile * f, HeaderObj * header)
1003 {
1004- AUDDBG("write header object\n");
1005+ TAGDBG("write header object\n");
1006 vfs_fseek(f, 0, SEEK_SET);
1007 return (guid_write_to_file(f, ASF_HEADER_OBJECT) && write_LEuint64(f, header->size) && write_LEuint32(f, header->objectsNr) && write_uint8(f, header->res1) && /* the reserved fields */
1008 write_uint8(f, header->res2));
1009@@ -368,7 +368,7 @@
1010 GUID_t *g;
1011 /*read all the headers and write them to the new file */
1012 /*the headers that contain tuple data will be overwritten */
1013- AUDDBG("Header Object size: %" PRId64 "\n", top_ho->size);
1014+ TAGDBG("Header Object size: %" PRId64 "\n", top_ho->size);
1015 //vfs_fseek(tmpfile, )
1016 for (i = 0; i < top_ho->objectsNr; i++)
1017 {
1018@@ -413,11 +413,11 @@
1019 /*
1020 if (g_rename(f1, f2) == 0)
1021 {
1022- AUDDBG("the tag was updated successfully\n");
1023+ TAGDBG("the tag was updated successfully\n");
1024 }
1025 else
1026 {
1027- AUDDBG("an error has occured\n");
1028+ TAGDBG("an error has occured\n");
1029 }
1030 */
1031 g_free(f1);
1032
Sound player with the WinAmp GUI, for GTK+/Qt
This page took 1.038191 seconds and 4 git commands to generate.