diff options
Diffstat (limited to 'firmware/id3.c')
-rw-r--r-- | firmware/id3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/id3.c b/firmware/id3.c index 90500663c1..8685d86790 100644 --- a/firmware/id3.c +++ b/firmware/id3.c | |||
@@ -83,14 +83,14 @@ static const char* const codec_labels[] = { | |||
83 | "ERR", /* Invalid codec type */ | 83 | "ERR", /* Invalid codec type */ |
84 | "???", /* Unknown file format */ | 84 | "???", /* Unknown file format */ |
85 | 85 | ||
86 | #if CONFIG_HWCODEC==MASNONE | 86 | #if CONFIG_CODEC==SWCODEC |
87 | "MP1", /* MPEG Audio layer 1 */ | 87 | "MP1", /* MPEG Audio layer 1 */ |
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | "MP2", /* MPEG Audio layer 2 */ | 90 | "MP2", /* MPEG Audio layer 2 */ |
91 | "MP3", /* MPEG Audio layer 3 */ | 91 | "MP3", /* MPEG Audio layer 3 */ |
92 | 92 | ||
93 | #if CONFIG_HWCODEC==MASNONE | 93 | #if CONFIG_CODEC==SWCODEC |
94 | "WAV", /* Uncompressed PCM in a WAV file */ | 94 | "WAV", /* Uncompressed PCM in a WAV file */ |
95 | "OGG", /* Ogg Vorbis */ | 95 | "OGG", /* Ogg Vorbis */ |
96 | "FLAC", /* FLAC */ | 96 | "FLAC", /* FLAC */ |
@@ -310,7 +310,7 @@ static int parsegenre( struct mp3entry* entry, char* tag, int bufferpos ) | |||
310 | } | 310 | } |
311 | } | 311 | } |
312 | 312 | ||
313 | #if CONFIG_HWCODEC == MASNONE | 313 | #if CONFIG_CODEC == SWCODEC |
314 | /* parse user defined text, looking for replaygain information. */ | 314 | /* parse user defined text, looking for replaygain information. */ |
315 | static int parseuser( struct mp3entry* entry, char* tag, int bufferpos ) | 315 | static int parseuser( struct mp3entry* entry, char* tag, int bufferpos ) |
316 | { | 316 | { |
@@ -352,7 +352,7 @@ static const struct tag_resolver taglist[] = { | |||
352 | { "TCOM", 4, offsetof(struct mp3entry, composer), NULL }, | 352 | { "TCOM", 4, offsetof(struct mp3entry, composer), NULL }, |
353 | { "TCON", 4, offsetof(struct mp3entry, genre_string), &parsegenre }, | 353 | { "TCON", 4, offsetof(struct mp3entry, genre_string), &parsegenre }, |
354 | { "TCO", 3, offsetof(struct mp3entry, genre_string), &parsegenre }, | 354 | { "TCO", 3, offsetof(struct mp3entry, genre_string), &parsegenre }, |
355 | #if CONFIG_HWCODEC == MASNONE | 355 | #if CONFIG_CODEC == SWCODEC |
356 | { "TXXX", 4, 0, &parseuser }, | 356 | { "TXXX", 4, 0, &parseuser }, |
357 | #endif | 357 | #endif |
358 | }; | 358 | }; |
@@ -885,7 +885,7 @@ static int getsonglength(int fd, struct mp3entry *entry) | |||
885 | entry->version = info.version; | 885 | entry->version = info.version; |
886 | entry->layer = info.layer; | 886 | entry->layer = info.layer; |
887 | switch(entry->layer) { | 887 | switch(entry->layer) { |
888 | #if CONFIG_HWCODEC==MASNONE | 888 | #if CONFIG_CODEC==SWCODEC |
889 | case 0: | 889 | case 0: |
890 | entry->codectype=AFMT_MPA_L1; | 890 | entry->codectype=AFMT_MPA_L1; |
891 | break; | 891 | break; |
@@ -947,7 +947,7 @@ bool mp3info(struct mp3entry *entry, const char *filename, bool v1first) | |||
947 | if(-1 == fd) | 947 | if(-1 == fd) |
948 | return true; | 948 | return true; |
949 | 949 | ||
950 | #if CONFIG_HWCODEC != MASNONE | 950 | #if CONFIG_CODEC != SWCODEC |
951 | memset(entry, 0, sizeof(struct mp3entry)); | 951 | memset(entry, 0, sizeof(struct mp3entry)); |
952 | #endif | 952 | #endif |
953 | 953 | ||