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

6 files changed, 7 insertions, 14 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 2bd4018751..98efec944a 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -174,12 +174,12 @@ usb_keymaps.c
 gui/usb_screen.c
 #endif
 metadata.c
-metadata/ape.c
 metadata/id3tags.c
-metadata/metadata_common.c
 metadata/mp3.c
 #if CONFIG_CODEC == SWCODEC
+metadata/metadata_common.c
 metadata/aiff.c
+metadata/ape.c
 metadata/asf.c
 metadata/adx.c
 metadata/flac.c
diff --git a/apps/metadata/id3tags.c b/apps/metadata/id3tags.c
index e54a17a5b6..a32d01589d 100644
--- a/apps/metadata/id3tags.c
+++ b/apps/metadata/id3tags.c
@@ -45,7 +45,9 @@
 
 #include "metadata.h"
 #include "mp3data.h"
+#if CONFIG_CODEC == SWCODEC
 #include "metadata_common.h"
+#endif
 #include "metadata_parsers.h"
 
 static unsigned long unsync(unsigned long b0,
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 @@
 #include "metadata.h"
 #include "metadata_common.h"
 #include "metadata_parsers.h"
-#if CONFIG_CODEC == SWCODEC
 #include "replaygain.h"
-#endif
 #include "misc.h"
 
 /* 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,
     char* buf, long buf_remaining, enum tagtype type)
 {
     long len = 0;
-    char** p = NULL;
+    char** p;
 
     if ((((strcasecmp(name, "track") == 0) && (type == TAGTYPE_APE)))
         || ((strcasecmp(name, "tracknumber") == 0) && (type == TAGTYPE_VORBIS)))
@@ -333,13 +331,11 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
     {
         p = &(id3->mb_track_id);
     }
-#if CONFIG_CODEC == SWCODEC
     else
     {
         len = parse_replaygain(name, value, id3, buf, buf_remaining);
         p = NULL;
     }
-#endif
     
     if (p)
     {
diff --git a/apps/metadata/mp3.c b/apps/metadata/mp3.c
index d20dffeb27..c65fb39cd8 100644
--- a/apps/metadata/mp3.c
+++ b/apps/metadata/mp3.c
@@ -190,11 +190,7 @@ bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename)
 
     /* only seek to end of file if no id3v2 tags were found */
     if (!entry->id3v2len) {
-        if (!setid3v1title(fd, entry))
-        {
-            /* when ID3 tags are not found, search APE tags */
-            read_ape_tags(fd, entry);
-        }
+        setid3v1title(fd, entry);
     }
 
     if(!entry->length || (entry->filesize < 8 ))
diff --git a/firmware/common/format.c b/firmware/common/format.c
index 987af417da..8b9556605f 100644
--- a/firmware/common/format.c
+++ b/firmware/common/format.c
@@ -122,6 +122,7 @@ int format(
             break;
 
         case 'l':
+        case 'z': /* assume sizeof(size_t) == sizeof(long) */
             ch = *fmt++;
             switch(ch) {
                 case 'x':
diff --git a/tools/database/SOURCES b/tools/database/SOURCES
index 46c9468a01..e66ea603e1 100644
--- a/tools/database/SOURCES
+++ b/tools/database/SOURCES
@@ -15,9 +15,7 @@ database.c
 ../../firmware/logf.c
 ../../uisimulator/common/io.c
 #if CONFIG_CODEC != SWCODEC
-../../apps/metadata/ape.c
 ../../apps/metadata/id3tags.c
-../../apps/metadata/metadata_common.c
 ../../apps/metadata/mp3.c
 #endif
 /* Caution. metadata files do not add!! */