Fixed the WPS codec type conditional, and removed unsupported formats from the format enum

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7441 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 1 insertions, 9 deletions

diff --git a/apps/metadata.c b/apps/metadata.c
index b3491b8c54..f2d7ed1d5e 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -54,16 +54,8 @@ int probe_file_format(const char *filename)
         return AFMT_FLAC;
     else if (!strcasecmp("mpc", suffix))
         return AFMT_MPC;
-    else if (!strcasecmp("aac", suffix))
-        return AFMT_AAC;
-    else if (!strcasecmp("ape", suffix))
-        return AFMT_APE;
-    else if (!strcasecmp("wma", suffix))
-        return AFMT_WMA;
     else if ((!strcasecmp("a52", suffix)) || (!strcasecmp("ac3", suffix)))
         return AFMT_A52;
-    else if (!strcasecmp("rm", suffix))
-        return AFMT_REAL;
     else if (!strcasecmp("wv", suffix))
         return AFMT_WAVPACK;
         
diff --git a/apps/wps-display.c b/apps/wps-display.c
index e7ee40cf0d..43524d0189 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -616,7 +616,7 @@ static char* get_tag(struct mp3entry* cid3,
                     return buf;
 
                 case 'c':  /* File Codec */
-                    *intval = id3->codectype+1;
+                    *intval = id3->codectype-1;
                     return id3_get_codec(id3);
             }
             break;