Mercurial > audlegacy
changeset 2532:9e135bfe457d trunk
[svn] - include stdio.h for debug print out.
- suppress warnings.
| author | yaz |
|---|---|
| date | Fri, 16 Feb 2007 04:21:17 -0800 |
| parents | 28814e6846e5 |
| children | ab335d4391df |
| files | ChangeLog src/audacious/build_stamp.c src/libid3tag/Makefile src/libid3tag/field.c src/libid3tag/frame.c src/libid3tag/genre.c src/libid3tag/tag.c |
| diffstat | 7 files changed, 23 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 15 19:31:14 2007 -0800 +++ b/ChangeLog Fri Feb 16 04:21:17 2007 -0800 @@ -1,3 +1,11 @@ +2007-02-16 03:31:14 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4072] + - remove debugging notice + + trunk/src/libid3tag/field.c | 2 -- + 1 file changed, 2 deletions(-) + + 2007-02-16 01:26:58 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4070] - manually save player positions.
--- a/src/audacious/build_stamp.c Thu Feb 15 19:31:14 2007 -0800 +++ b/src/audacious/build_stamp.c Fri Feb 16 04:21:17 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070216-4070"; +const gchar *svn_stamp = "20070216-4072";
--- a/src/libid3tag/Makefile Thu Feb 15 19:31:14 2007 -0800 +++ b/src/libid3tag/Makefile Fri Feb 16 04:21:17 2007 -0800 @@ -11,7 +11,7 @@ CFLAGS += $(PICFLAGS) \ -I.. \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) -Wall HEADERS = id3tag.h
--- a/src/libid3tag/field.c Thu Feb 15 19:31:14 2007 -0800 +++ b/src/libid3tag/field.c Fri Feb 16 04:21:17 2007 -0800 @@ -26,6 +26,7 @@ # include "global.h" # include <stdlib.h> +# include <stdio.h> # include <string.h> # ifdef HAVE_ASSERT_H
--- a/src/libid3tag/frame.c Thu Feb 15 19:31:14 2007 -0800 +++ b/src/libid3tag/frame.c Fri Feb 16 04:21:17 2007 -0800 @@ -26,6 +26,7 @@ # include "global.h" # include <stdlib.h> +# include <stdio.h> # include <string.h> # ifdef HAVE_ASSERT_H @@ -280,7 +281,7 @@ if (length < 6) goto fail; - compat = id3_compat_lookup(id, 3); + compat = id3_compat_lookup((char *)id, 3); *ptr += 3; size = id3_parse_uint(ptr, 3); @@ -296,7 +297,7 @@ if (length < 10) goto fail; - compat = id3_compat_lookup(id, 4); + compat = id3_compat_lookup((char *)id, 4); *ptr += 4; size = id3_parse_uint(ptr, 4); @@ -308,7 +309,7 @@ end = *ptr + size; if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~0x00e0)) { - frame = unparseable(id, ptr, end - *ptr, 0, 0, 0, 0); + frame = unparseable((char *)id, ptr, end - *ptr, 0, 0, 0, 0); goto done; } @@ -348,14 +349,14 @@ /* canonicalize frame ID for ID3v2.4 */ if (compat && compat->equiv) - id = compat->equiv; + id = (id3_byte_t *)compat->equiv; else if (ID3_TAG_VERSION_MAJOR(version) == 2) { xid[0] = 'Y'; xid[1] = id[0]; xid[2] = id[1]; xid[3] = id[2]; - id = xid; + id = (id3_byte_t *)xid; flags |= ID3_FRAME_FLAG_TAGALTERPRESERVATION | @@ -376,7 +377,7 @@ end = *ptr + size; if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~ID3_FRAME_FLAG_KNOWNFLAGS)) { - frame = unparseable(id, ptr, end - *ptr, flags, 0, 0, 0); + frame = unparseable((char *)id, ptr, end - *ptr, flags, 0, 0, 0); goto done; } @@ -423,7 +424,7 @@ } if (flags & ID3_FRAME_FLAG_ENCRYPTION) { - frame = unparseable(id, &data, end - data, flags, + frame = unparseable((char *)id, &data, end - data, flags, group_id, encryption_method, decoded_length); goto done; } @@ -445,13 +446,13 @@ /* check for obsolescence */ if (compat && !compat->equiv) { - frame = obsolete(id, data, end - data); + frame = obsolete((char *)id, data, end - data); goto done; } /* generate the internal frame structure */ - frame = id3_frame_new(id); + frame = id3_frame_new((char *)id); if (frame) { frame->flags = flags; frame->group_id = group_id;
--- a/src/libid3tag/genre.c Thu Feb 15 19:31:14 2007 -0800 +++ b/src/libid3tag/genre.c Fri Feb 16 04:21:17 2007 -0800 @@ -61,7 +61,7 @@ if (string[0] == 'C' && string[1] == 'R' && string[2] == 0) return genre_cover; - for (ptr = string; *ptr; ++ptr) { + for (ptr = (id3_ucs4_t *)string; *ptr; ++ptr) { if (*ptr < '0' || *ptr > '9') return string; }