aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-03-11 02:59:26 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-03-11 02:59:26 +0000
commit75a967014f76bd9bf3d76a9ce54d0b9510755c8c (patch)
tree559d0ff4417131aa6b39a9b9a9c899d11c9e9d2d /src
parent959f9880efdefe32ad2df8a7daf75e304eb04573 (diff)
downloadmpd-75a967014f76bd9bf3d76a9ce54d0b9510755c8c.tar.gz
mpd-75a967014f76bd9bf3d76a9ce54d0b9510755c8c.tar.xz
mpd-75a967014f76bd9bf3d76a9ce54d0b9510755c8c.zip
removed the id3v1_encoding config option, there's no way to guarantee that we actually got a given field from the v1 and not the v2 tag
git-svn-id: https://svn.musicpd.org/mpd/trunk@3052 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/conf.c1
-rw-r--r--src/conf.h1
-rw-r--r--src/tag.c17
3 files changed, 1 insertions, 18 deletions
diff --git a/src/conf.c b/src/conf.c
index 18d6c16fb..9675e97d3 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -151,7 +151,6 @@ void initConf() {
registerConfigParam(CONF_HTTP_BUFFER_SIZE, 0, 0);
registerConfigParam(CONF_HTTP_PREBUFFER_SIZE, 0, 0);
registerConfigParam(CONF_REPLAYGAIN_PREAMP, 0, 0);
- registerConfigParam(CONF_ID3V1_ENCODING, 0, 0);
registerConfigParam(CONF_METADATA_TO_USE, 0, 0);
}
diff --git a/src/conf.h b/src/conf.h
index 36d7b429e..375752b53 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -57,7 +57,6 @@
#define CONF_HTTP_PROXY_PASSWORD "http_proxy_password"
#define CONF_HTTP_BUFFER_SIZE "http_buffer_size"
#define CONF_HTTP_PREBUFFER_SIZE "http_prebuffer_size"
-#define CONF_ID3V1_ENCODING "id3v1_encoding"
#define CONF_METADATA_TO_USE "metadata_to_use"
typedef struct _BlockParam {
diff --git a/src/tag.c b/src/tag.c
index 41d76087c..96dbb40f3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -63,7 +63,6 @@ char * mpdTagItemKeys[TAG_NUM_OF_ITEM_TYPES] =
};
static mpd_sint8 ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
-static char * id3v1_encoding = NULL;
void initTagConfig() {
int quit = 0;
@@ -73,9 +72,6 @@ void initTagConfig() {
ConfigParam * param;
int i;
- param = getConfigParam(CONF_ID3V1_ENCODING);
- if(param) id3v1_encoding = param->value;
-
/* parse the "metadata_to_use" config parameter below */
memset(ignoreTagItems, 0, TAG_NUM_OF_ITEM_TYPES);
@@ -131,7 +127,6 @@ MpdTag * getID3Info(struct id3_tag * tag, char * id, int type, MpdTag * mpdTag)
struct id3_frame const * frame;
id3_ucs4_t const * ucs4;
id3_utf8_t * utf8;
- id3_latin1_t * latin1;
union id3_field const * field;
unsigned int nstrings;
int i;
@@ -150,17 +145,7 @@ MpdTag * getID3Info(struct id3_tag * tag, char * id, int type, MpdTag * mpdTag)
ucs4 = id3_genre_name(ucs4);
}
- if(id3v1_encoding &&
- (id3_tag_options(tag, 0, 0) & ID3_TAG_OPTION_ID3V1))
- {
- latin1 = id3_ucs4_latin1duplicate(ucs4);
- if(!latin1) continue;
-
- setCharSetConversion("UTF-8", id3v1_encoding);
- utf8 = convStrDup(latin1);
- free(latin1);
- }
- else utf8 = id3_ucs4_utf8duplicate(ucs4);
+ utf8 = id3_ucs4_utf8duplicate(ucs4);
if(!utf8) continue;