diff options
author | Yoshihisa Uchida <uchida@rockbox.org> | 2010-05-15 10:20:06 +0000 |
---|---|---|
committer | Yoshihisa Uchida <uchida@rockbox.org> | 2010-05-15 10:20:06 +0000 |
commit | fecf90fda951a817219cd13885d3da22c58bdcb5 (patch) | |
tree | 6f62cb75843c5bbdda9393de9b07e929ac61f518 /apps/metadata/metadata_common.c | |
parent | 77ec4b301b32bf1676987fab098194bc23fdf75a (diff) | |
download | rockbox-fecf90fda951a817219cd13885d3da22c58bdcb5.tar.gz rockbox-fecf90fda951a817219cd13885d3da22c58bdcb5.zip |
mp3: when ID3 tags are not found, search APE tags
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26048 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata/metadata_common.c')
-rw-r--r-- | apps/metadata/metadata_common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c index e1ef9a0d62..4130fcfd14 100644 --- a/apps/metadata/metadata_common.c +++ b/apps/metadata/metadata_common.c | |||
@@ -28,7 +28,9 @@ | |||
28 | #include "metadata.h" | 28 | #include "metadata.h" |
29 | #include "metadata_common.h" | 29 | #include "metadata_common.h" |
30 | #include "metadata_parsers.h" | 30 | #include "metadata_parsers.h" |
31 | #if CONFIG_CODEC == SWCODEC | ||
31 | #include "replaygain.h" | 32 | #include "replaygain.h" |
33 | #endif | ||
32 | #include "misc.h" | 34 | #include "misc.h" |
33 | 35 | ||
34 | /* Skip an ID3v2 tag if it can be found. We assume the tag is located at the | 36 | /* Skip an ID3v2 tag if it can be found. We assume the tag is located at the |
@@ -250,7 +252,7 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, | |||
250 | char* buf, long buf_remaining, enum tagtype type) | 252 | char* buf, long buf_remaining, enum tagtype type) |
251 | { | 253 | { |
252 | long len = 0; | 254 | long len = 0; |
253 | char** p; | 255 | char** p = NULL; |
254 | 256 | ||
255 | if ((((strcasecmp(name, "track") == 0) && (type == TAGTYPE_APE))) | 257 | if ((((strcasecmp(name, "track") == 0) && (type == TAGTYPE_APE))) |
256 | || ((strcasecmp(name, "tracknumber") == 0) && (type == TAGTYPE_VORBIS))) | 258 | || ((strcasecmp(name, "tracknumber") == 0) && (type == TAGTYPE_VORBIS))) |
@@ -331,11 +333,13 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, | |||
331 | { | 333 | { |
332 | p = &(id3->mb_track_id); | 334 | p = &(id3->mb_track_id); |
333 | } | 335 | } |
336 | #if CONFIG_CODEC == SWCODEC | ||
334 | else | 337 | else |
335 | { | 338 | { |
336 | len = parse_replaygain(name, value, id3, buf, buf_remaining); | 339 | len = parse_replaygain(name, value, id3, buf, buf_remaining); |
337 | p = NULL; | 340 | p = NULL; |
338 | } | 341 | } |
342 | #endif | ||
339 | 343 | ||
340 | if (p) | 344 | if (p) |
341 | { | 345 | { |