diff options
Diffstat (limited to 'apps/metadata.c')
-rw-r--r-- | apps/metadata.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/metadata.c b/apps/metadata.c index f9c4e9441f..84ee37c2fe 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -305,8 +305,6 @@ static bool read_ape_tags(int fd, struct mp3entry* id3) | |||
305 | return false; | 305 | return false; |
306 | } | 306 | } |
307 | 307 | ||
308 | id3->genre = 0xff; | ||
309 | |||
310 | if ((header.version == 2000) && (header.item_count > 0) | 308 | if ((header.version == 2000) && (header.item_count > 0) |
311 | && (header.length > APETAG_HEADER_LENGTH)) | 309 | && (header.length > APETAG_HEADER_LENGTH)) |
312 | { | 310 | { |
@@ -388,8 +386,6 @@ static bool read_vorbis_tags(int fd, struct mp3entry *id3, | |||
388 | int buf_remaining = sizeof(id3->id3v2buf) + sizeof(id3->id3v1buf); | 386 | int buf_remaining = sizeof(id3->id3v2buf) + sizeof(id3->id3v1buf); |
389 | int i; | 387 | int i; |
390 | 388 | ||
391 | id3->genre = 255; | ||
392 | |||
393 | if (ecread(fd, &len, 1, "l", IS_BIG_ENDIAN) < (long) sizeof(len)) | 389 | if (ecread(fd, &len, 1, "l", IS_BIG_ENDIAN) < (long) sizeof(len)) |
394 | { | 390 | { |
395 | return false; | 391 | return false; |
@@ -1355,7 +1351,7 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3, | |||
1355 | unsigned short genre; | 1351 | unsigned short genre; |
1356 | 1352 | ||
1357 | read_mp4_tag(fd, size, (char*) &genre, sizeof(genre)); | 1353 | read_mp4_tag(fd, size, (char*) &genre, sizeof(genre)); |
1358 | id3->genre = betoh16(genre); | 1354 | id3->genre_string = id3_get_num_genre(betoh16(genre)); |
1359 | } | 1355 | } |
1360 | break; | 1356 | break; |
1361 | 1357 | ||
@@ -1591,7 +1587,6 @@ static bool read_mp4_container(int fd, struct mp3entry* id3, | |||
1591 | static bool get_mp4_metadata(int fd, struct mp3entry* id3) | 1587 | static bool get_mp4_metadata(int fd, struct mp3entry* id3) |
1592 | { | 1588 | { |
1593 | id3->codectype = AFMT_UNKNOWN; | 1589 | id3->codectype = AFMT_UNKNOWN; |
1594 | id3->genre = 255; | ||
1595 | id3->filesize = 0; | 1590 | id3->filesize = 0; |
1596 | errno = 0; | 1591 | errno = 0; |
1597 | 1592 | ||
@@ -2179,7 +2174,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname, | |||
2179 | break; | 2174 | break; |
2180 | case AFMT_SPC: | 2175 | case AFMT_SPC: |
2181 | track->id3.filesize = filesize(fd); | 2176 | track->id3.filesize = filesize(fd); |
2182 | track->id3.genre = 36; | 2177 | track->id3.genre_string = id3_get_num_genre(36); |
2183 | break; | 2178 | break; |
2184 | case AFMT_ADX: | 2179 | case AFMT_ADX: |
2185 | if (!get_adx_metadata(fd, &(track->id3))) | 2180 | if (!get_adx_metadata(fd, &(track->id3))) |