devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Bill Napier wrote this:

Browse source 
This patch adds minimal suppport for 16-bit Unicode strings for ID3 tags. It
is basically a modification to the ID3v2 parser that checks for Unicode
strings. If a string is found that is a Unicode string, it is converted (in
place) to an ASCII string if it is an ASCII character.

Since we can support non-ASCII characters on the display, support for
non-ASCII characters in ID3 tags should proably also be supported in the
future. This patch is just an interem change until full Unicode support is
implemented (if ever).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2451 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2002-09-30 18:45:50 +00:00
parent 18ae8f5735
commit ad911c0ac8
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
firmware/id3.c
View file

@ -86,6 +86,28 @@ const int freqtab[][4] =
{22050, 24000, 16000, 0}, /* MPEG version 2 */
};
#define UNICODE_BOM_1 0xfffe
#define UNICODE_BOM_2 0xfeff
/* Checks to see if the passed in string is a 16-bit wide Unicode v2
string. If it is, we attempt to convert it to a 8-bit ASCII string
(for valid 8-bit ASCII characters). If it's not unicode, we leave
it alone. At some point we should fully support unicode strings */
static void unicode_munge(char* string) {
unsigned short* short_string = (unsigned short*)string;
if (short_string[0] == UNICODE_BOM_1 ||
short_string[0] == UNICODE_BOM_2) {
int x = 0;
do {
x++;
if (!(short_string[x]&0xff00)) {
string[x-1]=(short_string[x]&0xff);
}
} while (short_string[x]!=0x0000);
}
}
/*
* Removes trailing spaces from a string.
*
@ -249,6 +271,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
artist = buffer + readsize;
artistn = headerlen;
readsize += headerlen;
unicode_munge(artist);
}
else if(!strncmp(header, "TIT2", strlen("TIT2")) ||
!strncmp(header, "TT2", strlen("TT2"))) {
@ -257,6 +280,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
title = buffer + readsize;
titlen = headerlen;
readsize += headerlen;
unicode_munge(title);
}
else if(!strncmp(header, "TALB", strlen("TALB"))) {
readsize++;
@ -264,6 +288,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
album = buffer + readsize;
albumn = headerlen;
readsize += headerlen;
unicode_munge(album);
}
else if(!strncmp(header, "TRCK", strlen("TRCK"))) {
readsize++;
@ -271,6 +296,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
tracknum = buffer + readsize;
tracknumn = headerlen;
readsize += headerlen;
unicode_munge(tracknum);
} else {
readsize += headerlen;
}