From d67c267090471b4bf7f69b8a7702c22831e99c13 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Thu, 1 Sep 2005 13:39:39 +0000 Subject: 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 --- firmware/export/id3.h | 9 +-------- firmware/id3.c | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'firmware') 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 -- cgit v1.2.3