summaryrefslogtreecommitdiff
path: root/apps/metadata/metadata_common.c
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-05-15 21:57:17 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-05-15 21:57:17 +0000
commit3763ace3ec459b5dc7de796bd09d3f90b5dd69ba (patch)
tree51361aa09700a88cf7df74f68b9a4b931919c150 /apps/metadata/metadata_common.c
parent52d9d0d006a0067095b29b92904a3dcde8119413 (diff)
downloadrockbox-3763ace3ec459b5dc7de796bd09d3f90b5dd69ba.tar.gz
rockbox-3763ace3ec459b5dc7de796bd09d3f90b5dd69ba.zip
Revert r26048. APE tags in mp3 is explicitely on http://www.rockbox.org/wiki/NoDo
This sort of change should never go in without prior discussion or consensus git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26071 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata/metadata_common.c')
-rw-r--r--apps/metadata/metadata_common.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c
index 4130fcfd14..e1ef9a0d62 100644
--- a/apps/metadata/metadata_common.c
+++ b/apps/metadata/metadata_common.c
@@ -28,9 +28,7 @@
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
32#include "replaygain.h" 31#include "replaygain.h"
33#endif
34#include "misc.h" 32#include "misc.h"
35 33
36/* Skip an ID3v2 tag if it can be found. We assume the tag is located at the 34/* Skip an ID3v2 tag if it can be found. We assume the tag is located at the
@@ -252,7 +250,7 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
252 char* buf, long buf_remaining, enum tagtype type) 250 char* buf, long buf_remaining, enum tagtype type)
253{ 251{
254 long len = 0; 252 long len = 0;
255 char** p = NULL; 253 char** p;
256 254
257 if ((((strcasecmp(name, "track") == 0) && (type == TAGTYPE_APE))) 255 if ((((strcasecmp(name, "track") == 0) && (type == TAGTYPE_APE)))
258 || ((strcasecmp(name, "tracknumber") == 0) && (type == TAGTYPE_VORBIS))) 256 || ((strcasecmp(name, "tracknumber") == 0) && (type == TAGTYPE_VORBIS)))
@@ -333,13 +331,11 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
333 { 331 {
334 p = &(id3->mb_track_id); 332 p = &(id3->mb_track_id);
335 } 333 }
336#if CONFIG_CODEC == SWCODEC
337 else 334 else
338 { 335 {
339 len = parse_replaygain(name, value, id3, buf, buf_remaining); 336 len = parse_replaygain(name, value, id3, buf, buf_remaining);
340 p = NULL; 337 p = NULL;
341 } 338 }
342#endif
343 339
344 if (p) 340 if (p)
345 { 341 {