oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

stripReturnChar() in validateUtf8tag()

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2001 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-08-11 12:06:55 +00:00
parent ab0b6ce56f
commit 26d4e89d15
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tag.c
View File

@ -54,16 +54,20 @@ void printMpdTag(FILE * fp, MpdTag * tag) {
temp = latin1StrToUtf8Dup(str); \ temp = latin1StrToUtf8Dup(str); \
free(str); \ free(str); \
str = temp; \ str = temp; \
stripReturnChar(str); \
} \ } \
} }
void validateUtf8Tag(MpdTag * tag) { void validateUtf8Tag(MpdTag * tag) {
fixUtf8(tag->artist); fixUtf8(tag->artist);
stripReturnChar(tag->artist);
fixUtf8(tag->album); fixUtf8(tag->album);
stripReturnChar(tag->artist);
fixUtf8(tag->track); fixUtf8(tag->track);
stripReturnChar(tag->artist);
fixUtf8(tag->title); fixUtf8(tag->title);
stripReturnChar(tag->artist);
fixUtf8(tag->name); fixUtf8(tag->name);
stripReturnChar(tag->artist);
} }
#ifdef HAVE_ID3TAG #ifdef HAVE_ID3TAG
@ -99,28 +103,24 @@ MpdTag * parseId3Tag(struct id3_tag * tag) {
str = getID3Info(tag,ID3_FRAME_ARTIST); str = getID3Info(tag,ID3_FRAME_ARTIST);
if(str) { if(str) {
if(!ret) ret = newMpdTag(); if(!ret) ret = newMpdTag();
stripReturnChar(str);
ret->artist = str; ret->artist = str;
} }
str = getID3Info(tag,ID3_FRAME_TITLE); str = getID3Info(tag,ID3_FRAME_TITLE);
if(str) { if(str) {
if(!ret) ret = newMpdTag(); if(!ret) ret = newMpdTag();
stripReturnChar(str);
ret->title = str; ret->title = str;
} }
str = getID3Info(tag,ID3_FRAME_ALBUM); str = getID3Info(tag,ID3_FRAME_ALBUM);
if(str) { if(str) {
if(!ret) ret = newMpdTag(); if(!ret) ret = newMpdTag();
stripReturnChar(str);
ret->album = str; ret->album = str;
} }
str = getID3Info(tag,ID3_FRAME_TRACK); str = getID3Info(tag,ID3_FRAME_TRACK);
if(str) { if(str) {
if(!ret) ret = newMpdTag(); if(!ret) ret = newMpdTag();
stripReturnChar(str);
ret->track = str; ret->track = str;
} }