diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/id3.h | 9 | ||||
-rw-r--r-- | firmware/id3.c | 4 |
2 files changed, 1 insertions, 12 deletions
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 @@ | |||
28 | enum { | 28 | enum { |
29 | AFMT_UNKNOWN = 1, /* Unknown file format */ | 29 | AFMT_UNKNOWN = 1, /* Unknown file format */ |
30 | 30 | ||
31 | #if CONFIG_CODEC==SWCODEC | ||
32 | AFMT_MPA_L1, /* MPEG Audio layer 1 */ | 31 | AFMT_MPA_L1, /* MPEG Audio layer 1 */ |
33 | #endif | ||
34 | 32 | ||
35 | AFMT_MPA_L2, /* MPEG Audio layer 2 */ | 33 | AFMT_MPA_L2, /* MPEG Audio layer 2 */ |
36 | AFMT_MPA_L3, /* MPEG Audio layer 3 */ | 34 | AFMT_MPA_L3, /* MPEG Audio layer 3 */ |
37 | 35 | ||
38 | #if CONFIG_CODEC==SWCODEC | ||
39 | AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */ | 36 | AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */ |
40 | AFMT_OGG_VORBIS, /* Ogg Vorbis */ | 37 | AFMT_OGG_VORBIS, /* Ogg Vorbis */ |
41 | AFMT_FLAC, /* FLAC */ | 38 | AFMT_FLAC, /* FLAC */ |
42 | AFMT_MPC, /* Musepack */ | 39 | AFMT_MPC, /* Musepack */ |
43 | AFMT_AAC, /* AAC */ | ||
44 | AFMT_APE, /* Monkey's Audio */ | ||
45 | AFMT_WMA, /* Windows Media Audio */ | ||
46 | AFMT_A52, /* A/52 (aka AC3) audio */ | 40 | AFMT_A52, /* A/52 (aka AC3) audio */ |
47 | AFMT_REAL, /* Realaudio */ | ||
48 | AFMT_WAVPACK, /* WavPack */ | 41 | AFMT_WAVPACK, /* WavPack */ |
49 | #endif | ||
50 | 42 | ||
43 | /* New formats must be added to the end of this list */ | ||
51 | AFMT_ENDMARKER /* THIS MUST BE THE LAST VALUE */ | 44 | AFMT_ENDMARKER /* THIS MUST BE THE LAST VALUE */ |
52 | }; | 45 | }; |
53 | 46 | ||
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[] = { | |||
95 | "OGG", /* Ogg Vorbis */ | 95 | "OGG", /* Ogg Vorbis */ |
96 | "FLAC", /* FLAC */ | 96 | "FLAC", /* FLAC */ |
97 | "MPC", /* Musepack */ | 97 | "MPC", /* Musepack */ |
98 | "AAC", /* AAC */ | ||
99 | "APE", /* Monkey's Audio */ | ||
100 | "WMA", /* Windows Media Audio */ | ||
101 | "AC3", /* A/52 (aka AC3) audio */ | 98 | "AC3", /* A/52 (aka AC3) audio */ |
102 | "RA", /* Realaudio */ | ||
103 | "WV", /* WavPack */ | 99 | "WV", /* WavPack */ |
104 | #endif | 100 | #endif |
105 | NULL | 101 | NULL |