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

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

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@3052 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2005-03-11 02:59:26 +00:00
parent 959f9880ef
commit 75a967014f
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/conf.c
View File

@@ -151,7 +151,6 @@ void initConf() {
registerConfigParam(CONF_HTTP_BUFFER_SIZE, 0, 0); registerConfigParam(CONF_HTTP_BUFFER_SIZE, 0, 0);
registerConfigParam(CONF_HTTP_PREBUFFER_SIZE, 0, 0); registerConfigParam(CONF_HTTP_PREBUFFER_SIZE, 0, 0);
registerConfigParam(CONF_REPLAYGAIN_PREAMP, 0, 0); registerConfigParam(CONF_REPLAYGAIN_PREAMP, 0, 0);
registerConfigParam(CONF_ID3V1_ENCODING, 0, 0);
registerConfigParam(CONF_METADATA_TO_USE, 0, 0); registerConfigParam(CONF_METADATA_TO_USE, 0, 0);
} }

1
src/conf.h
View File

@@ -57,7 +57,6 @@
#define CONF_HTTP_PROXY_PASSWORD "http_proxy_password" #define CONF_HTTP_PROXY_PASSWORD "http_proxy_password"
#define CONF_HTTP_BUFFER_SIZE "http_buffer_size" #define CONF_HTTP_BUFFER_SIZE "http_buffer_size"
#define CONF_HTTP_PREBUFFER_SIZE "http_prebuffer_size" #define CONF_HTTP_PREBUFFER_SIZE "http_prebuffer_size"
#define CONF_ID3V1_ENCODING "id3v1_encoding"
#define CONF_METADATA_TO_USE "metadata_to_use" #define CONF_METADATA_TO_USE "metadata_to_use"
typedef struct _BlockParam { typedef struct _BlockParam {

17
src/tag.c
View File

@@ -63,7 +63,6 @@ char * mpdTagItemKeys[TAG_NUM_OF_ITEM_TYPES] =
}; };
static mpd_sint8 ignoreTagItems[TAG_NUM_OF_ITEM_TYPES]; static mpd_sint8 ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
static char * id3v1_encoding = NULL;
void initTagConfig() { void initTagConfig() {
int quit = 0; int quit = 0;
@@ -73,9 +72,6 @@ void initTagConfig() {
ConfigParam * param; ConfigParam * param;
int i; int i;
param = getConfigParam(CONF_ID3V1_ENCODING);
if(param) id3v1_encoding = param->value;
/* parse the "metadata_to_use" config parameter below */ /* parse the "metadata_to_use" config parameter below */
memset(ignoreTagItems, 0, TAG_NUM_OF_ITEM_TYPES); 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; struct id3_frame const * frame;
id3_ucs4_t const * ucs4; id3_ucs4_t const * ucs4;
id3_utf8_t * utf8; id3_utf8_t * utf8;
id3_latin1_t * latin1;
union id3_field const * field; union id3_field const * field;
unsigned int nstrings; unsigned int nstrings;
int i; int i;
@@ -150,17 +145,7 @@ MpdTag * getID3Info(struct id3_tag * tag, char * id, int type, MpdTag * mpdTag)
ucs4 = id3_genre_name(ucs4); ucs4 = id3_genre_name(ucs4);
} }
if(id3v1_encoding && utf8 = id3_ucs4_utf8duplicate(ucs4);
(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);
if(!utf8) continue; if(!utf8) continue;