diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-09-01 13:39:39 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-09-01 13:39:39 +0000 |
| commit | d67c267090471b4bf7f69b8a7702c22831e99c13 (patch) | |
| tree | 2fba305ca7aa16cbccd506b8a224d18cf973502a | |
| parent | ef197fbc9905e69fd76a76cd3a06284de7a044fb (diff) | |
| download | rockbox-d67c267090471b4bf7f69b8a7702c22831e99c13.zip rockbox-d67c267090471b4bf7f69b8a7702c22831e99c13.tar.gz rockbox-d67c267090471b4bf7f69b8a7702c22831e99c13.tar.bz2 rockbox-d67c267090471b4bf7f69b8a7702c22831e99c13.tar.xz | |
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
| -rw-r--r-- | apps/metadata.c | 8 | ||||
| -rw-r--r-- | apps/wps-display.c | 2 | ||||
| -rw-r--r-- | firmware/export/id3.h | 9 | ||||
| -rw-r--r-- | firmware/id3.c | 4 |
4 files changed, 2 insertions, 21 deletions
diff --git a/apps/metadata.c b/apps/metadata.c index b3491b8..f2d7ed1 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 e7ee40c..43524d0 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 5deebd4..d9b0432 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 dde030e..c5107fc 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 |