aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-08-11 12:06:55 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-08-11 12:06:55 +0000
commit26d4e89d15db60116ec54b99e9f9b7412fbd138f (patch)
tree6fc69f2311b0ddd44d12fd316e454b1f6dcda94b /src
parentab0b6ce56f9c3a505619de49df94a370a9732d88 (diff)
downloadmpd-26d4e89d15db60116ec54b99e9f9b7412fbd138f.tar.gz
mpd-26d4e89d15db60116ec54b99e9f9b7412fbd138f.tar.xz
mpd-26d4e89d15db60116ec54b99e9f9b7412fbd138f.zip
stripReturnChar() in validateUtf8tag()
git-svn-id: https://svn.musicpd.org/mpd/trunk@2001 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
-rw-r--r--src/tag.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tag.c b/src/tag.c
index 3f95f024d..8131790e2 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -54,16 +54,20 @@ void printMpdTag(FILE * fp, MpdTag * tag) {
temp = latin1StrToUtf8Dup(str); \
free(str); \
str = temp; \
- stripReturnChar(str); \
} \
}
void validateUtf8Tag(MpdTag * tag) {
fixUtf8(tag->artist);
+ stripReturnChar(tag->artist);
fixUtf8(tag->album);
+ stripReturnChar(tag->artist);
fixUtf8(tag->track);
+ stripReturnChar(tag->artist);
fixUtf8(tag->title);
+ stripReturnChar(tag->artist);
fixUtf8(tag->name);
+ stripReturnChar(tag->artist);
}
#ifdef HAVE_ID3TAG
@@ -99,28 +103,24 @@ MpdTag * parseId3Tag(struct id3_tag * tag) {
str = getID3Info(tag,ID3_FRAME_ARTIST);
if(str) {
if(!ret) ret = newMpdTag();
- stripReturnChar(str);
ret->artist = str;
}
str = getID3Info(tag,ID3_FRAME_TITLE);
if(str) {
if(!ret) ret = newMpdTag();
- stripReturnChar(str);
ret->title = str;
}
str = getID3Info(tag,ID3_FRAME_ALBUM);
if(str) {
if(!ret) ret = newMpdTag();
- stripReturnChar(str);
ret->album = str;
}
str = getID3Info(tag,ID3_FRAME_TRACK);
if(str) {
if(!ret) ret = newMpdTag();
- stripReturnChar(str);
ret->track = str;
}