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

tag_id3: moved id3_genre_name() call to tag_id3_import_text()

Browse Source 
The ID3_FRAME_GENRE field is queried only in tag_id3_import_text().
Don't pass the tag type to import_id3_string().
This commit is contained in:
Max Kellermann 2009-08-04 00:15:46 +02:00
parent 09571fcc55
commit 4363c49443
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tag_id3.c
View File

@ -79,14 +79,12 @@ tag_id3_getstring(const struct id3_frame *frame, unsigned i)
/* This will try to convert a string to utf-8, /* This will try to convert a string to utf-8,
*/ */
static id3_utf8_t * static id3_utf8_t *
import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4, enum tag_type type) import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
{ {
id3_utf8_t *utf8, *utf8_stripped; id3_utf8_t *utf8, *utf8_stripped;
id3_latin1_t *isostr; id3_latin1_t *isostr;
const char *encoding; const char *encoding;
if (type == TAG_ITEM_GENRE)
ucs4 = id3_genre_name(ucs4);
/* use encoding field here? */ /* use encoding field here? */
if (is_id3v1 && if (is_id3v1 &&
(encoding = config_get_string(CONF_ID3V1_ENCODING, NULL)) != NULL) { (encoding = config_get_string(CONF_ID3V1_ENCODING, NULL)) != NULL) {
@ -159,8 +157,10 @@ tag_id3_import_text(struct tag *dest, struct id3_tag *tag, const char *id,
if (ucs4 == NULL) if (ucs4 == NULL)
continue; continue;
utf8 = import_id3_string(tag_is_id3v1(tag), if (type == TAG_ITEM_GENRE)
ucs4, type); ucs4 = id3_genre_name(ucs4);
utf8 = import_id3_string(tag_is_id3v1(tag), ucs4);
if (utf8 == NULL) if (utf8 == NULL)
continue; continue;
@ -200,7 +200,7 @@ tag_id3_import_comment(struct tag *dest, struct id3_tag *tag, const char *id,
if (ucs4 == NULL) if (ucs4 == NULL)
return; return;
utf8 = import_id3_string(tag_is_id3v1(tag), ucs4, type); utf8 = import_id3_string(tag_is_id3v1(tag), ucs4);
if (utf8 == NULL) if (utf8 == NULL)
return; return;