4 files changed, 2 insertions, 21 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;
diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 5deebd41de..d9b0432023 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -28,26 +28,19 @@
 enum {
     AFMT_UNKNOWN = 1,  /* Unknown file format */
 
-#if CONFIG_CODEC==SWCODEC
     AFMT_MPA_L1,       /* MPEG Audio layer 1 */
-#endif
 
     AFMT_MPA_L2,       /* MPEG Audio layer 2 */
     AFMT_MPA_L3,       /* MPEG Audio layer 3 */
 
-#if CONFIG_CODEC==SWCODEC
     AFMT_PCM_WAV,      /* Uncompressed PCM in a WAV file */
     AFMT_OGG_VORBIS,   /* Ogg Vorbis */
     AFMT_FLAC,         /* FLAC */
     AFMT_MPC,          /* Musepack */
-    AFMT_AAC,          /* AAC */
-    AFMT_APE,          /* Monkey's Audio */
-    AFMT_WMA,          /* Windows Media Audio */
     AFMT_A52,          /* A/52 (aka AC3) audio */
-    AFMT_REAL,         /* Realaudio */
     AFMT_WAVPACK,      /* WavPack */
-#endif
 
+    /* New formats must be added to the end of this list */
     AFMT_ENDMARKER     /* THIS MUST BE THE LAST VALUE */
 };
 
diff --git a/firmware/id3.c b/firmware/id3.c
index dde030ec8a..c5107fc1cb 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -95,11 +95,7 @@ static const char* const codec_labels[] = {
   "OGG",  /* Ogg Vorbis */
   "FLAC", /* FLAC */
   "MPC",  /* Musepack */
-  "AAC",  /* AAC */
-  "APE",  /* Monkey's Audio */
-  "WMA",  /* Windows Media Audio */
   "AC3",  /* A/52 (aka AC3) audio */
-  "RA",   /* Realaudio */
   "WV",   /* WavPack */
 #endif
   NULL