From 58dbe4bb5d974c34335d6906a9ce930f07cd1db4 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Thu, 28 Oct 2004 05:14:55 +0000
Subject: merge shank-rewrite-config changes

git-svn-id: https://svn.musicpd.org/mpd/trunk@2375 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/tag.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/tag.c')

diff --git a/src/tag.c b/src/tag.c
index 08b620289..b5c71c500 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -93,18 +93,6 @@ char * getID3Info(struct id3_tag * tag, char * id) {
 	utf8 = id3_ucs4_utf8duplicate(ucs4);
 	if(!utf8) return NULL;
 
-	if(getConf()[CONF_ID3V1_ENCODING]
-	  && (id3_tag_options(tag, 0, 0) & ID3_TAG_OPTION_ID3V1)) {
-
-		char* isostr;
-		setCharSetConversion("ISO-8859-1", "UTF-8");
-		isostr = convStrDup(utf8);
-		free(utf8);
-		setCharSetConversion("UTF-8", getConf()[CONF_ID3V1_ENCODING]);
-		utf8 = convStrDup(isostr);
-		free(isostr);
-	}
-
 	return utf8;
 }
 #endif
-- 
cgit v1.2.3