changeset 2676:936c777ad998 trunk

[svn] - unsigned char should be used during id3v1 parse. closes #888.
author yaz
date Wed, 11 Apr 2007 00:28:41 -0700
parents ec92054edee9
children 52785bdac597
files ChangeLog src/audacious/build_stamp.c src/libid3tag/tag.c
diffstat 3 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 10 14:17:31 2007 -0700
+++ b/ChangeLog	Wed Apr 11 00:28:41 2007 -0700
@@ -1,3 +1,11 @@
+2007-04-10 21:17:31 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4376]
+  - chase r4268 (patch by Joker)
+  
+  trunk/src/audacious/playlist.h |    1 -
+  1 file changed, 1 deletion(-)
+
+
 2007-04-10 21:16:32 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4374]
   - use pthread_sigmask(SIG_BLOCK, ...) instead of of SIG_SETMASK
--- a/src/audacious/build_stamp.c	Tue Apr 10 14:17:31 2007 -0700
+++ b/src/audacious/build_stamp.c	Wed Apr 11 00:28:41 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070410-4374";
+const gchar *svn_stamp = "20070410-4376";
--- a/src/libid3tag/tag.c	Tue Apr 10 14:17:31 2007 -0700
+++ b/src/libid3tag/tag.c	Wed Apr 11 00:28:41 2007 -0700
@@ -331,13 +331,13 @@
 
 static
 int v1_attachstr(struct id3_tag *tag, char const *id,
-		 char *text, unsigned long number)
+		 id3_byte_t *text, unsigned long number)
 {
   struct id3_frame *frame;
   id3_ucs4_t ucs4[31];
 
   if (text) {
-    trim(text);
+      trim((char *)text);
     if (*text == 0)
       return 0;
   }
@@ -385,7 +385,7 @@
 
   tag = id3_tag_new();
   if (tag) {
-    char title[31], artist[31], album[31], year[5], comment[31];
+    id3_byte_t title[31], artist[31], album[31], year[5], comment[31];
     unsigned int genre, track;
 
     tag->version = 0x0100;
@@ -409,7 +409,7 @@
 
     track = 0;
     if (comment[28] == 0 && comment[29] != 0) {
-      track = comment[29];
+        track = comment[29];
       tag->version = 0x0101;
     }